diff options
| author | bors <bors@rust-lang.org> | 2022-09-10 17:39:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-10 17:39:16 +0000 |
| commit | 4a6ac3c225d6322caaf0ef86623cddc74e5260c6 (patch) | |
| tree | a606d8bccfa3d0afac4e0a1c3f63d05c27b6c2ce /compiler/rustc_codegen_ssa | |
| parent | 14636887008d9ee67a12b4f05f1e404ed1d64579 (diff) | |
| parent | 1cbbd2aa619555ed76b713062a039530406bbe3a (diff) | |
| download | rust-4a6ac3c225d6322caaf0ef86623cddc74e5260c6.tar.gz rust-4a6ac3c225d6322caaf0ef86623cddc74e5260c6.zip | |
Auto merge of #101647 - crlf0710:test_for_99551, r=bjorn3
Fix LLVM IR type mismatch reported in #99551 Closes #99551 .
Diffstat (limited to 'compiler/rustc_codegen_ssa')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/base.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/base.rs b/compiler/rustc_codegen_ssa/src/base.rs index 5f140d709d8..35fd86c1735 100644 --- a/compiler/rustc_codegen_ssa/src/base.rs +++ b/compiler/rustc_codegen_ssa/src/base.rs @@ -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 } |
