bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #101647 - crlf0710:test_for_99551, r=bjorn3

Browse source 
Fix LLVM IR type mismatch reported in #99551

Closes #99551 .
This commit is contained in:
bors 2022-09-10 17:39:16 +00:00
commit 4a6ac3c225
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_codegen_ssa/src/base.rs
View file

@ -166,6 +166,11 @@ pub fn unsized_info<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
if let Some(entry_idx) = vptr_entry_idx {
let ptr_ty = cx.type_i8p();
let ptr_align = cx.tcx().data_layout.pointer_align.abi;
let vtable_ptr_ty = cx.scalar_pair_element_backend_type(
cx.layout_of(cx.tcx().mk_mut_ptr(target)),
1,
true,
);
let llvtable = bx.pointercast(old_info, bx.type_ptr_to(ptr_ty));
let gep = bx.inbounds_gep(
ptr_ty,
@ -176,7 +181,7 @@ pub fn unsized_info<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
bx.nonnull_metadata(new_vptr);
// VTable loads are invariant.
bx.set_invariant_load(new_vptr);
new_vptr
bx.pointercast(new_vptr, vtable_ptr_ty)
} else {
old_info
}