diff options
| author | bors <bors@rust-lang.org> | 2024-09-24 06:02:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-24 06:02:43 +0000 |
| commit | 4cadeda932d5c261a9a0b1bbd25c4486e4e0a4c6 (patch) | |
| tree | 661cc7d8f6423f0caa9628e648059f6dadab121f /compiler/rustc_codegen_gcc | |
| parent | f5cd2c5888011d4d80311e5b771c6da507d860dd (diff) | |
| parent | 64aa4c6e2546b88de8dbb098158839b30dc04ac6 (diff) | |
| download | rust-4cadeda932d5c261a9a0b1bbd25c4486e4e0a4c6.tar.gz rust-4cadeda932d5c261a9a0b1bbd25c4486e4e0a4c6.zip | |
Auto merge of #130768 - compiler-errors:rollup-8ncjy55, r=compiler-errors
Rollup of 7 pull requests Successful merges: - #129545 (rustdoc: redesign toolbar and disclosure widgets) - #130618 (Skip query in get_parent_item when possible.) - #130727 (Check vtable projections for validity in miri) - #130750 (Add new Tier-3 target: `loongarch64-unknown-linux-ohos`) - #130758 (Revert "Add recursion limit to FFI safety lint") - #130759 (Update books) - #130762 (stabilize const_intrinsic_copy) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/common.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_gcc/src/common.rs b/compiler/rustc_codegen_gcc/src/common.rs index c7cf73f1992..726b126e727 100644 --- a/compiler/rustc_codegen_gcc/src/common.rs +++ b/compiler/rustc_codegen_gcc/src/common.rs @@ -224,10 +224,10 @@ impl<'gcc, 'tcx> ConstCodegenMethods<'tcx> for CodegenCx<'gcc, 'tcx> { value } GlobalAlloc::Function { instance, .. } => self.get_fn_addr(instance), - GlobalAlloc::VTable(ty, trait_ref) => { + GlobalAlloc::VTable(ty, dyn_ty) => { let alloc = self .tcx - .global_alloc(self.tcx.vtable_allocation((ty, trait_ref))) + .global_alloc(self.tcx.vtable_allocation((ty, dyn_ty.principal()))) .unwrap_memory(); let init = const_alloc_to_gcc(self, alloc); self.static_addr_of(init, alloc.inner().align, None) |