OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix matching on field.abi instead of self.layout.abi

Browse Source
This commit is contained in:
khyperia 2020-08-30 13:38:47 +02:00
parent 81650f485c
commit 1663bfba02
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc_codegen_ssa/mir/operand.rs
View File

@ -220,7 +220,7 @@ impl<'a, 'tcx, V: CodegenObject> OperandRef<'tcx, V> {
_ => bug!("OperandRef::extract_field({:?}): not applicable", self), _ => bug!("OperandRef::extract_field({:?}): not applicable", self),
}; };
match (&mut val, &self.layout.abi) { match (&mut val, &field.abi) {
(OperandValue::Immediate(llval), _) => { (OperandValue::Immediate(llval), _) => {
// Bools in union fields needs to be truncated. // Bools in union fields needs to be truncated.
*llval = bx.to_immediate(*llval, field); *llval = bx.to_immediate(*llval, field);
@ -228,9 +228,11 @@ impl<'a, 'tcx, V: CodegenObject> OperandRef<'tcx, V> {
*llval = bx.bitcast(*llval, bx.cx().immediate_backend_type(field)); *llval = bx.bitcast(*llval, bx.cx().immediate_backend_type(field));
} }
(OperandValue::Pair(a, b), Abi::ScalarPair(a_abi, b_abi)) => { (OperandValue::Pair(a, b), Abi::ScalarPair(a_abi, b_abi)) => {
// Bools in union fields needs to be truncated.
*a = bx.to_immediate_scalar(*a, a_abi); *a = bx.to_immediate_scalar(*a, a_abi);
*a = bx.bitcast(*a, bx.cx().scalar_pair_element_backend_type(field, 0, true));
*b = bx.to_immediate_scalar(*b, b_abi); *b = bx.to_immediate_scalar(*b, b_abi);
// HACK(eddyb) have to bitcast pointers until LLVM removes pointee types.
*a = bx.bitcast(*a, bx.cx().scalar_pair_element_backend_type(field, 0, true));
*b = bx.bitcast(*b, bx.cx().scalar_pair_element_backend_type(field, 1, true)); *b = bx.bitcast(*b, bx.cx().scalar_pair_element_backend_type(field, 1, true));
} }
(OperandValue::Pair(..), _) => bug!(), (OperandValue::Pair(..), _) => bug!(),