Move #[rustc_symbol_name] and #[rustc_def_path] processing

Bryntet · Bryntet · commit beed1d68f078 · 2026-01-11T02:52:15.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
@@ -4455,6 +4455,7 @@ dependencies = [
  "rustc_privacy",
  "rustc_session",
  "rustc_span",
+ "rustc_symbol_mangling",
  "rustc_target",
  "rustc_trait_selection",
  "tracing",
diff --git a/compiler/rustc_attr_parsing/src/attributes/rustc_internal.rs b/compiler/rustc_attr_parsing/src/attributes/rustc_internal.rs
@@ -310,6 +310,7 @@ const SYMBOL_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[
     Allow(Target::Fn),
     Allow(Target::Method(MethodKind::TraitImpl)),
     Allow(Target::Method(MethodKind::Inherent)),
+    Allow(Target::Method(MethodKind::Trait { body: true })),
     Allow(Target::ForeignFn),
     Allow(Target::ForeignStatic),
     Allow(Target::Impl { of_trait: false }),
diff --git a/compiler/rustc_hir/src/hir.rs b/compiler/rustc_hir/src/hir.rs
@@ -1364,9 +1364,6 @@ impl AttributeExt for Attribute {
             Attribute::Parsed(AttributeKind::DocComment { span, .. }) => *span,
             Attribute::Parsed(AttributeKind::Deprecation { span, .. }) => *span,
             Attribute::Parsed(AttributeKind::CfgTrace(cfgs)) => cfgs[0].1,
-            Attribute::Parsed(AttributeKind::RustcSymbolName(span)) => *span,
-            Attribute::Parsed(AttributeKind::RustcDefPath(span)) => *span,
-
             a => panic!("can't get the span of an arbitrary parsed attribute: {a:?}"),
         }
     }
diff --git a/compiler/rustc_interface/src/passes.rs b/compiler/rustc_interface/src/passes.rs
@@ -1234,12 +1234,6 @@ pub(crate) fn start_codegen<'tcx>(
         tcx.ensure_ok().trigger_delayed_bug(def_id);
     }
 
-    // Don't run this test assertions when not doing codegen. Compiletest tries to build
-    // build-fail tests in check mode first and expects it to not give an error in that case.
-    if tcx.sess.opts.output_types.should_codegen() {
-        rustc_symbol_mangling::test::report_symbol_names(tcx);
-    }
-
     // Don't do code generation if there were any errors. Likewise if
     // there were any delayed bugs, because codegen will likely cause
     // more ICEs, obscuring the original problem.
diff --git a/compiler/rustc_passes/Cargo.toml b/compiler/rustc_passes/Cargo.toml
@@ -21,6 +21,7 @@ rustc_middle = { path = "../rustc_middle" }
 rustc_privacy = { path = "../rustc_privacy" }
 rustc_session = { path = "../rustc_session" }
 rustc_span = { path = "../rustc_span" }
+rustc_symbol_mangling = { path = "../rustc_symbol_mangling" }
 rustc_target = { path = "../rustc_target" }
 rustc_trait_selection = { path = "../rustc_trait_selection" }
 tracing = "0.1"
diff --git a/compiler/rustc_passes/src/check_attr.rs b/compiler/rustc_passes/src/check_attr.rs
@@ -55,7 +55,15 @@ use rustc_trait_selection::traits::ObligationCtxt;
 use tracing::debug;
 
 use crate::{errors, fluent_generated as fluent};
-
+const SYMBOL_TARGETS: &'static [Target] = &[
+    Target::Fn,
+    Target::Method(MethodKind::TraitImpl),
+    Target::Method(MethodKind::Inherent),
+    Target::Method(MethodKind::Trait { body: true }),
+    Target::ForeignFn,
+    Target::ForeignStatic,
+    Target::Impl { of_trait: false },
+];
 #[derive(LintDiagnostic)]
 #[diag(passes_diagnostic_diagnostic_on_unimplemented_only_for_traits)]
 struct DiagnosticOnUnimplementedOnlyForTraits;
@@ -222,7 +230,13 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
                 },
                 Attribute::Parsed(AttributeKind::RustcMustImplementOneOf { attr_span, fn_names }) => {
                     self.check_rustc_must_implement_one_of(*attr_span, fn_names, hir_id,target)
-                },
+                }
+                Attribute::Parsed(AttributeKind::RustcSymbolName(attr_span)) => {
+                    self.check_rustc_symbol_name(*attr_span, hir_id, target)
+                }
+                Attribute::Parsed(AttributeKind::RustcDefPath(attr_span)) => {
+                    self.check_rustc_def_path(*attr_span, hir_id, target);
+                }
                 Attribute::Parsed(
                     AttributeKind::EiiExternTarget { .. }
                     | AttributeKind::EiiExternItem
@@ -306,8 +320,6 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
                     | AttributeKind::CfgAttrTrace
                     | AttributeKind::ThreadLocal
                     | AttributeKind::CfiEncoding { .. }
-                    | AttributeKind::RustcSymbolName(..)
-                    | AttributeKind::RustcDefPath(..)
                 ) => { /* do nothing  */ }
                 Attribute::Unparsed(attr_item) => {
                     style = Some(attr_item.style);
@@ -450,6 +462,30 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
         self.check_mix_no_mangle_export(hir_id, attrs);
     }
 
+    fn check_rustc_symbol_name(&self, attr_span: Span, hir_id: HirId, target: Target) {
+        // Don't run this test assertions when not doing codegen. Compiletest tries to build
+        // build-fail tests in check mode first and expects it to not give an error in that case.
+        if self.tcx.sess.opts.output_types.should_codegen() && SYMBOL_TARGETS.contains(&target) {
+            rustc_symbol_mangling::test::process_symbol_name_attr(
+                self.tcx,
+                hir_id.owner.def_id,
+                attr_span,
+            );
+        }
+    }
+
+    fn check_rustc_def_path(&self, attr_span: Span, hir_id: HirId, target: Target) {
+        // Don't run this test assertions when not doing codegen. Compiletest tries to build
+        // build-fail tests in check mode first and expects it to not give an error in that case.
+        if self.tcx.sess.opts.output_types.should_codegen() && SYMBOL_TARGETS.contains(&target) {
+            rustc_symbol_mangling::test::process_def_path_attr(
+                self.tcx,
+                hir_id.owner.def_id,
+                attr_span,
+            );
+        }
+    }
+
     fn check_rustc_must_implement_one_of(
         &self,
         attr_span: Span,
diff --git a/compiler/rustc_symbol_mangling/src/test.rs b/compiler/rustc_symbol_mangling/src/test.rs
@@ -4,94 +4,45 @@
 //! def-path. This is used for unit testing the code that generates
 //! paths etc in all kinds of annoying scenarios.
 
-use rustc_hir::Attribute;
-use rustc_hir::attrs::AttributeKind;
 use rustc_hir::def_id::LocalDefId;
 use rustc_middle::ty::print::with_no_trimmed_paths;
 use rustc_middle::ty::{GenericArgs, Instance, TyCtxt};
+use rustc_span::Span;
 
 use crate::errors::{Kind, TestOutput};
 
-pub fn report_symbol_names(tcx: TyCtxt<'_>) {
-    // if the `rustc_attrs` feature is not enabled, then the
-    // attributes we are interested in cannot be present anyway, so
-    // skip the walk.
-    if !tcx.features().rustc_attrs() {
-        return;
+#[inline(always)]
+pub fn process_symbol_name_attr<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId, attr_span: Span) {
+    let def_id = def_id.to_def_id();
+    let instance = Instance::new_raw(
+        def_id,
+        tcx.erase_and_anonymize_regions(GenericArgs::identity_for_item(tcx, def_id)),
+    );
+    let mangled = tcx.symbol_name(instance);
+    tcx.dcx().emit_err(TestOutput {
+        span: attr_span,
+        kind: Kind::SymbolName,
+        content: format!("{mangled}"),
+    });
+    if let Ok(demangling) = rustc_demangle::try_demangle(mangled.name) {
+        tcx.dcx().emit_err(TestOutput {
+            span: attr_span,
+            kind: Kind::Demangling,
+            content: format!("{demangling}"),
+        });
+        tcx.dcx().emit_err(TestOutput {
+            span: attr_span,
+            kind: Kind::DemanglingAlt,
+            content: format!("{demangling:#}"),
+        });
     }
-
-    tcx.dep_graph.with_ignore(|| {
-        let mut symbol_names = SymbolNamesTest { tcx };
-        let crate_items = tcx.hir_crate_items(());
-
-        for id in crate_items.free_items() {
-            symbol_names.process_attrs(id.owner_id.def_id);
-        }
-
-        for id in crate_items.trait_items() {
-            symbol_names.process_attrs(id.owner_id.def_id);
-        }
-
-        for id in crate_items.impl_items() {
-            symbol_names.process_attrs(id.owner_id.def_id);
-        }
-
-        for id in crate_items.foreign_items() {
-            symbol_names.process_attrs(id.owner_id.def_id);
-        }
-    })
 }
 
-struct SymbolNamesTest<'tcx> {
-    tcx: TyCtxt<'tcx>,
-}
-
-impl SymbolNamesTest<'_> {
-    fn process_attrs(&mut self, def_id: LocalDefId) {
-        let tcx = self.tcx;
-        // The formatting of `tag({})` is chosen so that tests can elect
-        // to test the entirety of the string, if they choose, or else just
-        // some subset.
-        for attr in tcx
-            .get_all_attrs(def_id)
-            .into_iter()
-            .filter(|attr| matches!(attr, Attribute::Parsed(AttributeKind::RustcSymbolName(..))))
-        {
-            let def_id = def_id.to_def_id();
-            let instance = Instance::new_raw(
-                def_id,
-                tcx.erase_and_anonymize_regions(GenericArgs::identity_for_item(tcx, def_id)),
-            );
-            let mangled = tcx.symbol_name(instance);
-            tcx.dcx().emit_err(TestOutput {
-                span: attr.span(),
-                kind: Kind::SymbolName,
-                content: format!("{mangled}"),
-            });
-            if let Ok(demangling) = rustc_demangle::try_demangle(mangled.name) {
-                tcx.dcx().emit_err(TestOutput {
-                    span: attr.span(),
-                    kind: Kind::Demangling,
-                    content: format!("{demangling}"),
-                });
-                tcx.dcx().emit_err(TestOutput {
-                    span: attr.span(),
-                    kind: Kind::DemanglingAlt,
-                    content: format!("{demangling:#}"),
-                });
-            }
-        }
-
-        for attr in tcx
-            .get_all_attrs(def_id)
-            .into_iter()
-            .filter(|attr| matches!(attr, Attribute::Parsed(AttributeKind::RustcDefPath(..))))
-        {
-            tcx.dcx().emit_err(TestOutput {
-                span: attr.span(),
-                kind: Kind::DefPath,
-                content: with_no_trimmed_paths!(tcx.def_path_str(def_id)),
-            });
-        }
-    }
+#[inline(always)]
+pub fn process_def_path_attr<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId, attr_span: Span) {
+    tcx.dcx().emit_err(TestOutput {
+        span: attr_span,
+        kind: Kind::DefPath,
+        content: with_no_trimmed_paths!(tcx.def_path_str(def_id)),
+    });
 }
diff --git a/tests/ui/symbol-names/basic.legacy.stderr b/tests/ui/symbol-names/basic.legacy.stderr
@@ -1,3 +1,9 @@
+error: def-path(main)
+  --> $DIR/basic.rs:15:1
+   |
+LL | #[rustc_def_path]
+   | ^^^^^^^^^^^^^^^^^
+
 error: symbol-name(_ZN5basic4main17h1dddcfd03744167fE)
   --> $DIR/basic.rs:8:1
    |
@@ -16,11 +22,5 @@ error: demangling-alt(basic::main)
 LL | #[rustc_symbol_name]
    | ^^^^^^^^^^^^^^^^^^^^
 
-error: def-path(main)
-  --> $DIR/basic.rs:15:1
-   |
-LL | #[rustc_def_path]
-   | ^^^^^^^^^^^^^^^^^
-
 error: aborting due to 4 previous errors
 
diff --git a/tests/ui/symbol-names/basic.v0.stderr b/tests/ui/symbol-names/basic.v0.stderr
@@ -1,3 +1,9 @@
+error: def-path(main)
+  --> $DIR/basic.rs:15:1
+   |
+LL | #[rustc_def_path]
+   | ^^^^^^^^^^^^^^^^^
+
 error: symbol-name(_RNvCsCRATE_HASH_5basic4main)
   --> $DIR/basic.rs:8:1
    |
@@ -16,11 +22,5 @@ error: demangling-alt(basic::main)
 LL | #[rustc_symbol_name]
    | ^^^^^^^^^^^^^^^^^^^^
 
-error: def-path(main)
-  --> $DIR/basic.rs:15:1
-   |
-LL | #[rustc_def_path]
-   | ^^^^^^^^^^^^^^^^^
-
 error: aborting due to 4 previous errors
 
diff --git a/tests/ui/symbol-names/impl1.legacy.stderr b/tests/ui/symbol-names/impl1.legacy.stderr
@@ -1,3 +1,33 @@
+error: def-path(<[&dyn Foo<Assoc = for<'a> extern "C" fn(&'a u8, ...)> + AutoTrait; 3] as main::{closure#1}::Bar>::method)
+  --> $DIR/impl1.rs:69:13
+   |
+LL |             #[rustc_def_path]
+   |             ^^^^^^^^^^^^^^^^^
+
+error: symbol-name(_ZN209_$LT$$u5b$$RF$dyn$u20$impl1..Foo$u2b$Assoc$u20$$u3d$$u20$extern$u20$$u22$C$u22$$u20$fn$LP$$RF$u8$C$$u20$...$RP$$u2b$impl1..AutoTrait$u3b$$u20$3$u5d$$u20$as$u20$impl1..main..$u7b$$u7b$closure$u7d$$u7d$..Bar$GT$6method17<SYMBOL_HASH>)
+  --> $DIR/impl1.rs:62:13
+   |
+LL |             #[rustc_symbol_name]
+   |             ^^^^^^^^^^^^^^^^^^^^
+
+error: demangling(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; 3] as impl1::main::{{closure}}::Bar>::method::<SYMBOL_HASH>)
+  --> $DIR/impl1.rs:62:13
+   |
+LL |             #[rustc_symbol_name]
+   |             ^^^^^^^^^^^^^^^^^^^^
+
+error: demangling-alt(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; 3] as impl1::main::{{closure}}::Bar>::method)
+  --> $DIR/impl1.rs:62:13
+   |
+LL |             #[rustc_symbol_name]
+   |             ^^^^^^^^^^^^^^^^^^^^
+
+error: def-path(foo::Foo::bar)
+  --> $DIR/impl1.rs:21:9
+   |
+LL |         #[rustc_def_path]
+   |         ^^^^^^^^^^^^^^^^^
+
 error: symbol-name(_ZN5impl13foo3Foo3bar17<SYMBOL_HASH>)
   --> $DIR/impl1.rs:14:9
    |
@@ -16,8 +46,8 @@ error: demangling-alt(impl1::foo::Foo::bar)
 LL |         #[rustc_symbol_name]
    |         ^^^^^^^^^^^^^^^^^^^^
 
-error: def-path(foo::Foo::bar)
-  --> $DIR/impl1.rs:21:9
+error: def-path(bar::<impl foo::Foo>::baz)
+  --> $DIR/impl1.rs:39:9
    |
 LL |         #[rustc_def_path]
    |         ^^^^^^^^^^^^^^^^^
@@ -40,35 +70,5 @@ error: demangling-alt(impl1::bar::<impl impl1::foo::Foo>::baz)
 LL |         #[rustc_symbol_name]
    |         ^^^^^^^^^^^^^^^^^^^^
 
-error: def-path(bar::<impl foo::Foo>::baz)
-  --> $DIR/impl1.rs:39:9
-   |
-LL |         #[rustc_def_path]
-   |         ^^^^^^^^^^^^^^^^^
-
-error: symbol-name(_ZN209_$LT$$u5b$$RF$dyn$u20$impl1..Foo$u2b$Assoc$u20$$u3d$$u20$extern$u20$$u22$C$u22$$u20$fn$LP$$RF$u8$C$$u20$...$RP$$u2b$impl1..AutoTrait$u3b$$u20$3$u5d$$u20$as$u20$impl1..main..$u7b$$u7b$closure$u7d$$u7d$..Bar$GT$6method17<SYMBOL_HASH>)
-  --> $DIR/impl1.rs:62:13
-   |
-LL |             #[rustc_symbol_name]
-   |             ^^^^^^^^^^^^^^^^^^^^
-
-error: demangling(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; 3] as impl1::main::{{closure}}::Bar>::method::<SYMBOL_HASH>)
-  --> $DIR/impl1.rs:62:13
-   |
-LL |             #[rustc_symbol_name]
-   |             ^^^^^^^^^^^^^^^^^^^^
-
-error: demangling-alt(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; 3] as impl1::main::{{closure}}::Bar>::method)
-  --> $DIR/impl1.rs:62:13
-   |
-LL |             #[rustc_symbol_name]
-   |             ^^^^^^^^^^^^^^^^^^^^
-
-error: def-path(<[&dyn Foo<Assoc = for<'a> extern "C" fn(&'a u8, ...)> + AutoTrait; 3] as main::{closure#1}::Bar>::method)
-  --> $DIR/impl1.rs:69:13
-   |
-LL |             #[rustc_def_path]
-   |             ^^^^^^^^^^^^^^^^^
-
 error: aborting due to 12 previous errors
 
diff --git a/tests/ui/symbol-names/impl1.v0.stderr b/tests/ui/symbol-names/impl1.v0.stderr

Original file line number	Diff line number	Diff line change
`@@ -1364,9 +1364,6 @@ impl AttributeExt for Attribute {`
`1364`	`1364`	`Attribute::Parsed(AttributeKind::DocComment { span, .. }) => *span,`
`1365`	`1365`	`Attribute::Parsed(AttributeKind::Deprecation { span, .. }) => *span,`
`1366`	`1366`	`Attribute::Parsed(AttributeKind::CfgTrace(cfgs)) => cfgs[0].1,`
`1367`		`- Attribute::Parsed(AttributeKind::RustcSymbolName(span)) => *span,`
`1368`		`- Attribute::Parsed(AttributeKind::RustcDefPath(span)) => *span,`
`1369`		`-`
`1370`	`1367`	`a => panic!("can't get the span of an arbitrary parsed attribute: {a:?}"),`
`1371`	`1368`	`}`
`1372`	`1369`	`}`