Skip to content

Commit f6848d1

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 7362c5d + abd0023 commit f6848d1

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/driver/aot.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,8 @@ fn codegen_cgu_content(
530530
for (mono_item, item_data) in mono_items {
531531
match mono_item {
532532
MonoItem::Fn(instance) => {
533-
if tcx.codegen_fn_attrs(instance.def_id()).flags.contains(CodegenFnAttrFlags::NAKED)
534-
{
533+
let flags = tcx.codegen_instance_attrs(instance.def).flags;
534+
if flags.contains(CodegenFnAttrFlags::NAKED) {
535535
rustc_codegen_ssa::mir::naked_asm::codegen_naked_asm(
536536
&mut GlobalAsmContext { tcx, global_asm: &mut cx.global_asm },
537537
instance,

src/driver/jit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ fn codegen_and_compile_fn<'tcx>(
127127
module: &mut dyn Module,
128128
instance: Instance<'tcx>,
129129
) {
130-
if tcx.codegen_fn_attrs(instance.def_id()).flags.contains(CodegenFnAttrFlags::NAKED) {
130+
if tcx.codegen_instance_attrs(instance.def).flags.contains(CodegenFnAttrFlags::NAKED) {
131131
tcx.dcx()
132132
.span_fatal(tcx.def_span(instance.def_id()), "Naked asm is not supported in JIT mode");
133133
}

src/driver/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fn predefine_mono_items<'tcx>(
3535
is_compiler_builtins,
3636
);
3737
let is_naked = tcx
38-
.codegen_fn_attrs(instance.def_id())
38+
.codegen_instance_attrs(instance.def)
3939
.flags
4040
.contains(CodegenFnAttrFlags::NAKED);
4141
module

0 commit comments

Comments
 (0)