diff options
| author | bors <bors@rust-lang.org> | 2024-07-04 23:45:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-04 23:45:56 +0000 |
| commit | 489233170abcc97f59a1ee2211535f0ff67a0b43 (patch) | |
| tree | 6c0aa43dade23cab3ff64c61f5d960ec78a403d1 /compiler/rustc_codegen_gcc/src/common.rs | |
| parent | cc8da78a036dc3c15c35a97651b02af9a6d30c1e (diff) | |
| parent | 41b98da42d0500e38b9dd85c82110ba177ac4de1 (diff) | |
| download | rust-489233170abcc97f59a1ee2211535f0ff67a0b43.tar.gz rust-489233170abcc97f59a1ee2211535f0ff67a0b43.zip | |
Auto merge of #123781 - RalfJung:miri-fn-identity, r=oli-obk
Miri function identity hack: account for possible inlining Having a non-lifetime generic is not the only reason a function can be duplicated. Another possibility is that the function may be eligible for cross-crate inlining. So also take into account the inlining attribute in this Miri hack for function pointer identity. That said, `cross_crate_inlinable` will still sometimes return true even for `inline(never)` functions: - when they are `DefKind::Ctor(..) | DefKind::Closure` -- I assume those cannot be `InlineAttr::Never` anyway? - when `cross_crate_inline_threshold == InliningThreshold::Always` so maybe this is still not quite the right criterion to use for function pointer identity.
Diffstat (limited to 'compiler/rustc_codegen_gcc/src/common.rs')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/common.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_gcc/src/common.rs b/compiler/rustc_codegen_gcc/src/common.rs index 230fe4f5871..fa8a1ec037c 100644 --- a/compiler/rustc_codegen_gcc/src/common.rs +++ b/compiler/rustc_codegen_gcc/src/common.rs @@ -220,7 +220,7 @@ impl<'gcc, 'tcx> ConstMethods<'tcx> for CodegenCx<'gcc, 'tcx> { } value } - GlobalAlloc::Function(fn_instance) => self.get_fn_addr(fn_instance), + GlobalAlloc::Function { instance, .. } => self.get_fn_addr(instance), GlobalAlloc::VTable(ty, trait_ref) => { let alloc = self .tcx |
