dont create unnecessary DefIds under mgca

Author: BoxyUwU

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -1451,7 +1451,10 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
                     _ => false,
                 }
             {
-                continue;
+                // MGCA doesn't have unnecessary DefIds
+                if !tcx.features().min_generic_const_args() {
+                    continue;
+                }
             }
 
             if def_kind == DefKind::Field

compiler/rustc_resolve/src/def_collector.rs

@@ -357,6 +357,13 @@ impl<'a, 'ra, 'tcx> visit::Visitor<'a> for DefCollector<'a, 'ra, 'tcx> {
     }
 
     fn visit_anon_const(&mut self, constant: &'a AnonConst) {
+        if let MgcaDisambiguation::Direct = constant.mgca_disambiguation
+            && self.resolver.tcx.features().min_generic_const_args()
+        {
+            visit::walk_anon_const(self, constant);
+            return;
+        }
+
         let parent = self.create_def(constant.id, None, DefKind::AnonConst, constant.value.span);
         self.with_parent(parent, |this| visit::walk_anon_const(this, constant));
     }

tests/ui/const-generics/mgca/explicit_anon_consts.rs

@@ -1,5 +1,8 @@
 #![feature(associated_const_equality, generic_const_items, min_generic_const_args)]
 #![expect(incomplete_features)]
+// library crates exercise weirder code paths around
+// DefIds which were created for const args.
+#![crate_type = "lib"]
 
 struct Foo<const N: usize>;
 
@@ -66,5 +69,3 @@ struct Default3<const N: usize, const M: usize = const { N }>;
 struct Default4<const N: usize, const M: usize = { 1 + 1 }>;
 //~^ ERROR: complex const arguments must be placed inside of a `const` block
 struct Default5<const N: usize, const M: usize = const { 1 + 1}>;
-
-fn main() {}

tests/ui/const-generics/mgca/explicit_anon_consts.stderr

@@ -1,5 +1,5 @@
 error: generic parameters may not be used in const operations
-  --> $DIR/explicit_anon_consts.rs:8:41
+  --> $DIR/explicit_anon_consts.rs:11:41
    |
 LL | type Adt3<const N: usize> = Foo<const { N }>;
    |                                         ^ cannot perform const operation using `N`
@@ -8,7 +8,7 @@ LL | type Adt3<const N: usize> = Foo<const { N }>;
    = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
 
 error: generic parameters may not be used in const operations
-  --> $DIR/explicit_anon_consts.rs:16:42
+  --> $DIR/explicit_anon_consts.rs:19:42
    |
 LL | type Arr3<const N: usize> = [(); const { N }];
    |                                          ^ cannot perform const operation using `N`
@@ -17,7 +17,7 @@ LL | type Arr3<const N: usize> = [(); const { N }];
    = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
 
 error: generic parameters may not be used in const operations
-  --> $DIR/explicit_anon_consts.rs:25:27
+  --> $DIR/explicit_anon_consts.rs:28:27
    |
 LL |     let _3 = [(); const { N }];
    |                           ^ cannot perform const operation using `N`
@@ -26,7 +26,7 @@ LL |     let _3 = [(); const { N }];
    = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
 
 error: generic parameters may not be used in const operations
-  --> $DIR/explicit_anon_consts.rs:37:46
+  --> $DIR/explicit_anon_consts.rs:40:46
    |
 LL | const ITEM3<const N: usize>: usize = const { N };
    |                                              ^ cannot perform const operation using `N`
@@ -35,7 +35,7 @@ LL | const ITEM3<const N: usize>: usize = const { N };
    = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
 
 error: generic parameters may not be used in const operations
-  --> $DIR/explicit_anon_consts.rs:55:31
+  --> $DIR/explicit_anon_consts.rs:58:31
    |
 LL |     T3: Trait<ASSOC = const { N }>,
    |                               ^ cannot perform const operation using `N`
@@ -44,7 +44,7 @@ LL |     T3: Trait<ASSOC = const { N }>,
    = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
 
 error: generic parameters may not be used in const operations
-  --> $DIR/explicit_anon_consts.rs:64:58
+  --> $DIR/explicit_anon_consts.rs:67:58
    |
 LL | struct Default3<const N: usize, const M: usize = const { N }>;
    |                                                          ^ cannot perform const operation using `N`
@@ -53,37 +53,37 @@ LL | struct Default3<const N: usize, const M: usize = const { N }>;
    = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
 
 error: complex const arguments must be placed inside of a `const` block
-  --> $DIR/explicit_anon_consts.rs:10:33
+  --> $DIR/explicit_anon_consts.rs:13:33
    |
 LL | type Adt4<const N: usize> = Foo<{ 1 + 1 }>;
    |                                 ^^^^^^^^^
 
 error: complex const arguments must be placed inside of a `const` block
-  --> $DIR/explicit_anon_consts.rs:18:34
+  --> $DIR/explicit_anon_consts.rs:21:34
    |
 LL | type Arr4<const N: usize> = [(); 1 + 1];
    |                                  ^^^^^
 
 error: complex const arguments must be placed inside of a `const` block
-  --> $DIR/explicit_anon_consts.rs:27:19
+  --> $DIR/explicit_anon_consts.rs:30:19
    |
 LL |     let _4 = [(); 1 + 1];
    |                   ^^^^^
 
 error: complex const arguments must be placed inside of a `const` block
-  --> $DIR/explicit_anon_consts.rs:40:38
+  --> $DIR/explicit_anon_consts.rs:43:38
    |
 LL | const ITEM4<const N: usize>: usize = { 1 + 1 };
    |                                      ^^^^^^^^^
 
 error: complex const arguments must be placed inside of a `const` block
-  --> $DIR/explicit_anon_consts.rs:57:23
+  --> $DIR/explicit_anon_consts.rs:60:23
    |
 LL |     T4: Trait<ASSOC = { 1 + 1 }>,
    |                       ^^^^^^^^^
 
 error: complex const arguments must be placed inside of a `const` block
-  --> $DIR/explicit_anon_consts.rs:66:50
+  --> $DIR/explicit_anon_consts.rs:69:50
    |
 LL | struct Default4<const N: usize, const M: usize = { 1 + 1 }>;
    |                                                  ^^^^^^^^^