Tolerate non-ptr indirect scalars in codegen.

cjgillot · cjgillot · commit 699240567446 · 2023-09-23T14:07:10.000Z
diff --git a/compiler/rustc_codegen_ssa/src/mir/operand.rs b/compiler/rustc_codegen_ssa/src/mir/operand.rs
@@ -156,7 +156,7 @@ impl<'a, 'tcx, V: CodegenObject> OperandRef<'tcx, V> {
             Abi::Scalar(s @ abi::Scalar::Initialized { .. }) => {
                 let size = s.size(bx);
                 assert_eq!(size, layout.size, "abi::Scalar size does not match layout size");
-                let val = read_scalar(Size::ZERO, size, s, bx.type_ptr());
+                let val = read_scalar(Size::ZERO, size, s, bx.backend_type(layout));
                 OperandRef { val: OperandValue::Immediate(val), layout }
             }
             Abi::ScalarPair(

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ impl<'a, 'tcx, V: CodegenObject> OperandRef<'tcx, V> {`
`156`	`156`	`Abi::Scalar(s @ abi::Scalar::Initialized { .. }) => {`
`157`	`157`	`let size = s.size(bx);`
`158`	`158`	`assert_eq!(size, layout.size, "abi::Scalar size does not match layout size");`
`159`		`- let val = read_scalar(Size::ZERO, size, s, bx.type_ptr());`
	`159`	`+ let val = read_scalar(Size::ZERO, size, s, bx.backend_type(layout));`
`160`	`160`	`OperandRef { val: OperandValue::Immediate(val), layout }`
`161`	`161`	`}`
`162`	`162`	`Abi::ScalarPair(`