Skip to content

Commit 3ded89b

Browse files
committed
Auto merge of #147838 - matthiaskrgr:rollup-r8r148d, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang/rust#140153 (Implement `Debug` for `EncodeWide`) - rust-lang/rust#145724 (the `#[track_caller]` shim should not inherit `#[no_mangle]`) - rust-lang/rust#147258 (iter repeat: panic on last) - rust-lang/rust#147454 (Fix backtraces with `-C panic=abort` on qnx; emit unwind tables by default) - rust-lang/rust#147468 (Implement fs api set_times and set_times_nofollow) - rust-lang/rust#147764 (Undo CopyForDeref assertion in const qualif) - rust-lang/rust#147805 (use module_child index as disambiguator for external items) - rust-lang/rust#147824 (docs: update Motor OS target docs) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f208e27 + 2336b69 commit 3ded89b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/abi/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ pub(crate) fn codegen_terminator_call<'tcx>(
467467
true
468468
} else {
469469
instance.is_some_and(|inst| {
470-
fx.tcx.codegen_fn_attrs(inst.def_id()).flags.contains(CodegenFnAttrFlags::COLD)
470+
fx.tcx.codegen_instance_attrs(inst.def).flags.contains(CodegenFnAttrFlags::COLD)
471471
})
472472
};
473473
if is_cold {

0 commit comments

Comments
 (0)