bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't bitcast aggregate field.

Browse source
This commit is contained in:
Luqman Aden 2022-12-15 23:18:25 -08:00
parent af69cc0ea0
commit 6a5ee11027
1 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

27
compiler/rustc_codegen_ssa/src/mir/operand.rs
View file

@ -237,13 +237,18 @@ impl<'a, 'tcx, V: CodegenObject> OperandRef<'tcx, V> {
}; };
match (&mut val, field.abi) { match (&mut val, field.abi) {
(OperandValue::Immediate(llval), _) => { (
OperandValue::Immediate(llval),
Abi::Scalar(_) | Abi::ScalarPair(..) | Abi::Vector { .. },
) => {
// 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);
// HACK(eddyb) have to bitcast pointers until LLVM removes pointee types. // HACK(eddyb) have to bitcast pointers until LLVM removes pointee types.
let ty = bx.cx().immediate_backend_type(field); let ty = bx.cx().immediate_backend_type(field);
if bx.type_kind(ty) == TypeKind::Pointer { if bx.type_kind(ty) == TypeKind::Pointer {
*llval = bx.pointercast(*llval, ty); *llval = bx.pointercast(*llval, ty);
} else {
*llval = bx.bitcast(*llval, ty);
} }
} }
(OperandValue::Pair(a, b), Abi::ScalarPair(a_abi, b_abi)) => { (OperandValue::Pair(a, b), Abi::ScalarPair(a_abi, b_abi)) => {
@ -255,11 +260,31 @@ impl<'a, 'tcx, V: CodegenObject> OperandRef<'tcx, V> {
let b_ty = bx.cx().scalar_pair_element_backend_type(field, 1, true); let b_ty = bx.cx().scalar_pair_element_backend_type(field, 1, true);
if bx.type_kind(a_ty) == TypeKind::Pointer { if bx.type_kind(a_ty) == TypeKind::Pointer {
*a = bx.pointercast(*a, a_ty); *a = bx.pointercast(*a, a_ty);
} else {
*a = bx.bitcast(*a, a_ty);
} }
if bx.type_kind(b_ty) == TypeKind::Pointer { if bx.type_kind(b_ty) == TypeKind::Pointer {
*b = bx.pointercast(*b, b_ty); *b = bx.pointercast(*b, b_ty);
} else {
*b = bx.bitcast(*b, b_ty);
} }
} }
// Newtype vector of array, e.g. #[repr(simd)] struct S([i32; 4]);
(OperandValue::Immediate(llval), Abi::Aggregate { sized: true }) => {
assert!(matches!(self.layout.abi, Abi::Vector { .. }));
let llty = bx.cx().backend_type(self.layout);
let llfield_ty = bx.cx().backend_type(field);
// Can't bitcast an aggregate, so round trip through memory.
let lltemp = bx.alloca(llfield_ty, field.align.abi);
let llptr = bx.pointercast(lltemp, bx.cx().type_ptr_to(llty));
bx.store(*llval, llptr, field.align.abi);
*llval = bx.load(llfield_ty, lltemp, field.align.abi);
}
(OperandValue::Immediate(_), Abi::Uninhabited | Abi::Aggregate { sized: false }) => {
bug!()
}
(OperandValue::Pair(..), _) => bug!(), (OperandValue::Pair(..), _) => bug!(),
(OperandValue::Ref(..), _) => bug!(), (OperandValue::Ref(..), _) => bug!(),
} }