user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix write_cvalue for ByValPair when the cvalue is not trivially a pair

Browse source 
`write_cvalue` didn't work for `Box<[u8]>`, because the inner fat ptr
was wrapped inside a newtype, which meant `Box<[u8]>` itself only had
one field.

This also simplifies `CValue::force_stack` by reusing `write_cvalue`
when it is not already on the stack.
This commit is contained in:
bjorn3 2019-06-16 12:51:16 +02:00
parent 4d406cdcad
commit 65bc1e5b5b
1 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/value_and_place.rs
View file

@ -53,28 +53,10 @@ impl<'tcx> CValue<'tcx> {
let layout = self.1;
match self.0 {
CValueInner::ByRef(value) => value,
CValueInner::ByVal(value) => {
let stack_slot = fx.bcx.create_stack_slot(StackSlotData {
kind: StackSlotKind::ExplicitSlot,
size: layout.size.bytes() as u32,
offset: None,
});
let addr = fx.bcx.ins().stack_addr(fx.pointer_type, stack_slot, 0);
fx.bcx.ins().store(MemFlags::new(), value, addr, 0);
addr
}
CValueInner::ByValPair(value, extra) => {
let stack_slot = fx.bcx.create_stack_slot(StackSlotData {
kind: StackSlotKind::ExplicitSlot,
size: layout.size.bytes() as u32,
offset: None,
});
let base = fx.bcx.ins().stack_addr(types::I64, stack_slot, 0);
let a_addr = codegen_field(fx, base, layout, mir::Field::new(0)).0;
let b_addr = codegen_field(fx, base, layout, mir::Field::new(1)).0;
fx.bcx.ins().store(MemFlags::new(), value, a_addr, 0);
fx.bcx.ins().store(MemFlags::new(), extra, b_addr, 0);
base
CValueInner::ByVal(_) | CValueInner::ByValPair(_, _) => {
let cplace = CPlace::new_stack_slot(fx, layout.ty);
cplace.write_cvalue(fx, self);
cplace.to_addr(fx)
}
}
}
@ -356,11 +338,22 @@ impl<'a, 'tcx: 'a> CPlace<'tcx> {
CValueInner::ByVal(val) => {
fx.bcx.ins().store(MemFlags::new(), val, addr, 0);
}
CValueInner::ByValPair(val1, val2) => {
let val1_offset = dst_layout.fields.offset(0).bytes() as i32;
let val2_offset = dst_layout.fields.offset(1).bytes() as i32;
fx.bcx.ins().store(MemFlags::new(), val1, addr, val1_offset);
fx.bcx.ins().store(MemFlags::new(), val2, addr, val2_offset);
CValueInner::ByValPair(value, extra) => {
match dst_layout.abi {
Abi::ScalarPair(ref a, _) => {
fx.bcx.ins().store(MemFlags::new(), value, addr, 0);
fx.bcx.ins().store(
MemFlags::new(),
extra,
addr,
a.value.size(&fx.tcx).bytes() as u32 as i32,
);
}
_ => bug!(
"Non ScalarPair abi {:?} for ByValPair CValue",
dst_layout.abi
),
}
}
CValueInner::ByRef(from_addr) => {
let src_layout = from.1;