Skip to content

Commit 197d503

Browse files
committed
Auto merge of #145906 - samueltardieu:rollup-p8ibzhz, r=samueltardieu
Rollup of 9 pull requests Successful merges: - rust-lang/rust#144499 (ci: Begin running ui tests with `rust.debuginfo-level-tests=1`) - rust-lang/rust#145790 (Improve dist for gnullvm hosts) - rust-lang/rust#145792 (Use attribute name in message for "outer attr used as inner attr" errors) - rust-lang/rust#145840 (rustc_codegen_ssa: More comprehensive RISC-V ELF flags) - rust-lang/rust#145876 (Enable building/disting standard library in stage 0) - rust-lang/rust#145887 (bootstrap: Don't panic if codegen-backends is set to empty) - rust-lang/rust#145888 (platform-support: Fix LoongArch32 host column) - rust-lang/rust#145892 (add a flag to codegen fn attrs for foreign items) - rust-lang/rust#145901 (Fix typo in comment of library/alloc/src/raw_vec/mod.rs) r? `@ghost` `@rustbot` modify labels: rollup
2 parents bf2e306 + 05a1069 commit 197d503

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/bin/miri.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ impl rustc_driver::Callbacks for MiriBeRustCompilerCalls {
279279
return None;
280280
}
281281
let codegen_fn_attrs = tcx.codegen_fn_attrs(local_def_id);
282-
if codegen_fn_attrs.contains_extern_indicator(tcx, local_def_id.into())
282+
if codegen_fn_attrs.contains_extern_indicator()
283283
|| codegen_fn_attrs
284284
.flags
285285
.contains(CodegenFnAttrFlags::USED_COMPILER)

src/helpers.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ pub fn iter_exported_symbols<'tcx>(
134134
for def_id in crate_items.definitions() {
135135
let exported = tcx.def_kind(def_id).has_codegen_attrs() && {
136136
let codegen_attrs = tcx.codegen_fn_attrs(def_id);
137-
codegen_attrs.contains_extern_indicator(tcx, def_id.into())
138-
|| codegen_attrs.flags.contains(CodegenFnAttrFlags::RUSTC_STD_INTERNAL_SYMBOL)
137+
codegen_attrs.contains_extern_indicator()
139138
|| codegen_attrs.flags.contains(CodegenFnAttrFlags::USED_COMPILER)
140139
|| codegen_attrs.flags.contains(CodegenFnAttrFlags::USED_LINKER)
141140
};

0 commit comments

Comments
 (0)