diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-12-02 13:50:44 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2025-03-17 14:06:56 +0000 |
| commit | 60b785fc8d2ca002189c7c4956f46e3ebe66fb63 (patch) | |
| tree | 672c02a599cbca7c628e74d78a2ac4d314184e12 | |
| parent | 98b9d0232fce1a0fbac328a2b31393e9c77712ec (diff) | |
| download | rust-60b785fc8d2ca002189c7c4956f46e3ebe66fb63.tar.gz rust-60b785fc8d2ca002189c7c4956f46e3ebe66fb63.zip | |
Mark #[rustc_std_internal_symbol] as extern indicator
It currently implies #[no_mangle] which is alread an extern indicator, but this will change in a future commit.
| -rw-r--r-- | compiler/rustc_middle/src/middle/codegen_fn_attrs.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_passes/src/reachable.rs | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/compiler/rustc_middle/src/middle/codegen_fn_attrs.rs b/compiler/rustc_middle/src/middle/codegen_fn_attrs.rs index a94ead161c3..0cc72a261a5 100644 --- a/compiler/rustc_middle/src/middle/codegen_fn_attrs.rs +++ b/compiler/rustc_middle/src/middle/codegen_fn_attrs.rs @@ -174,6 +174,7 @@ impl CodegenFnAttrs { /// * `#[linkage]` is present pub fn contains_extern_indicator(&self) -> bool { self.flags.contains(CodegenFnAttrFlags::NO_MANGLE) + || self.flags.contains(CodegenFnAttrFlags::RUSTC_STD_INTERNAL_SYMBOL) || self.export_name.is_some() || match self.linkage { // These are private, so make sure we don't try to consider diff --git a/compiler/rustc_passes/src/reachable.rs b/compiler/rustc_passes/src/reachable.rs index 599a08bac20..b9e413a20c1 100644 --- a/compiler/rustc_passes/src/reachable.rs +++ b/compiler/rustc_passes/src/reachable.rs @@ -184,9 +184,7 @@ impl<'tcx> ReachableContext<'tcx> { CodegenFnAttrs::EMPTY }; let is_extern = codegen_attrs.contains_extern_indicator(); - let std_internal = - codegen_attrs.flags.contains(CodegenFnAttrFlags::RUSTC_STD_INTERNAL_SYMBOL); - if is_extern || std_internal { + if is_extern { self.reachable_symbols.insert(search_item); } } else { @@ -426,7 +424,6 @@ fn has_custom_linkage(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool { } let codegen_attrs = tcx.codegen_fn_attrs(def_id); codegen_attrs.contains_extern_indicator() - || codegen_attrs.flags.contains(CodegenFnAttrFlags::RUSTC_STD_INTERNAL_SYMBOL) // FIXME(nbdd0121): `#[used]` are marked as reachable here so it's picked up by // `linked_symbols` in cg_ssa. They won't be exported in binary or cdylib due to their // `SymbolExportLevel::Rust` export level but may end up being exported in dylibs. |