Skip to content

Commit e0025df

Browse files
authored
Rollup merge of rust-lang#56097 - ogoffart:union-abi, r=eddyb
Fix invalid bitcast taking bool out of a union represented as a scalar As reported in rust-lang#54668 (comment)
2 parents fb33fa4 + 4c21f66 commit e0025df

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

src/librustc_codegen_ssa/mir/operand.rs

+14-3
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,24 @@ impl<'a, 'tcx: 'a, V: CodegenObject> OperandRef<'tcx, V> {
244244
};
245245

246246
// HACK(eddyb) have to bitcast pointers until LLVM removes pointee types.
247+
// Bools in union fields needs to be truncated.
248+
let to_immediate_or_cast = |bx: &mut Bx, val, ty| {
249+
if ty == bx.cx().type_i1() {
250+
bx.trunc(val, ty)
251+
} else {
252+
bx.bitcast(val, ty)
253+
}
254+
};
255+
247256
match val {
248257
OperandValue::Immediate(ref mut llval) => {
249-
*llval = bx.bitcast(*llval, bx.cx().immediate_backend_type(field));
258+
*llval = to_immediate_or_cast(bx, *llval, bx.cx().immediate_backend_type(field));
250259
}
251260
OperandValue::Pair(ref mut a, ref mut b) => {
252-
*a = bx.bitcast(*a, bx.cx().scalar_pair_element_backend_type(field, 0, true));
253-
*b = bx.bitcast(*b, bx.cx().scalar_pair_element_backend_type(field, 1, true));
261+
*a = to_immediate_or_cast(bx, *a, bx.cx()
262+
.scalar_pair_element_backend_type(field, 0, true));
263+
*b = to_immediate_or_cast(bx, *b, bx.cx()
264+
.scalar_pair_element_backend_type(field, 1, true));
254265
}
255266
OperandValue::Ref(..) => bug!()
256267
}

src/test/codegen/union-abi.rs

+6
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,9 @@ pub union CUnionU128{a:u128}
7878
#[no_mangle]
7979
pub fn test_CUnionU128(_: CUnionU128) { loop {} }
8080

81+
pub union UnionBool { b:bool }
82+
// CHECK: define zeroext i1 @test_UnionBool(i8 %b)
83+
#[no_mangle]
84+
pub fn test_UnionBool(b: UnionBool) -> bool { unsafe { b.b } }
85+
// CHECK: %0 = trunc i8 %b to i1
86+

0 commit comments

Comments
 (0)