Skip to content

Commit 042c115

Browse files
committed
Auto merge of #144109 - matthiaskrgr:rollup-mz0mrww, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - rust-lang/rust#142300 (Disable `tests/run-make/mte-ffi` because no CI runners have MTE extensions enabled) - rust-lang/rust#143271 (Store the type of each GVN value) - rust-lang/rust#143293 (fix `-Zsanitizer=kcfi` on `#[naked]` functions) - rust-lang/rust#143719 (Emit warning when there is no space between `-o` and arg) - rust-lang/rust#143846 (pass --gc-sections if -Zexport-executable-symbols is enabled and improve tests) - rust-lang/rust#143891 (Port `#[coverage]` to the new attribute system) - rust-lang/rust#143967 (constify `Option` methods) - rust-lang/rust#144008 (Fix false positive double negations with macro invocation) - rust-lang/rust#144010 (Boostrap: add warning on `optimize = false`) - rust-lang/rust#144049 (rustc-dev-guide subtree update) - rust-lang/rust#144056 (Copy GCC sources into the build directory even outside CI) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 93c0b64 + a6c3db0 commit 042c115

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/machine.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
10861086
ecx: &MiriInterpCx<'tcx>,
10871087
instance: ty::Instance<'tcx>,
10881088
) -> InterpResult<'tcx> {
1089-
let attrs = ecx.tcx.codegen_fn_attrs(instance.def_id());
1089+
let attrs = ecx.tcx.codegen_instance_attrs(instance.def);
10901090
if attrs
10911091
.target_features
10921092
.iter()
@@ -1790,7 +1790,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
17901790
ecx.tcx.sess.opts.unstable_opts.cross_crate_inline_threshold,
17911791
InliningThreshold::Always
17921792
) || !matches!(
1793-
ecx.tcx.codegen_fn_attrs(instance.def_id()).inline,
1793+
ecx.tcx.codegen_instance_attrs(instance.def).inline,
17941794
InlineAttr::Never
17951795
);
17961796
!is_generic && !can_be_inlined

0 commit comments

Comments
 (0)