nameres stuff

Author: BoxyUwU

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -2484,9 +2484,11 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
         debug!(?expr);
 
         // If the rhs is an anon const naming generics it shouldn't have
-        // access to then we lower to `ConstKind::Error`.
+        // access to then we lower to `ConstKind::Error`. This prevents
+        // `try_lower_anon_const_lit` from ICEing on anon consts such as
+        // `const { N }` which aren't supposed to be legal.
         if let ty::AnonConstKind::MCG = tcx.anon_const_kind(anon.def_id)
-            && let Err(e) = tcx.hir_const_arg_anon_check_invalid_param_uses(anon.def_id)
+            && let Err(e) = tcx.check_anon_const_invalid_param_uses(anon.def_id)
         {
             return ty::Const::new_error(tcx, e);
         }

compiler/rustc_hir_typeck/src/lib.rs

@@ -117,7 +117,7 @@ fn typeck_with_inspect<'tcx>(
 
     if let DefKind::AnonConst = tcx.def_kind(def_id)
         && let ty::AnonConstKind::MCG = tcx.anon_const_kind(def_id)
-        && let Err(e) = tcx.hir_const_arg_anon_check_invalid_param_uses(def_id)
+        && let Err(e) = tcx.check_anon_const_invalid_param_uses(def_id)
     {
         e.raise_fatal();
     }

compiler/rustc_middle/src/hir/map.rs

@@ -1091,7 +1091,12 @@ impl<'tcx> TyCtxt<'tcx> {
         None
     }
 
-    pub fn hir_const_arg_anon_check_invalid_param_uses(
+    // FIXME(mgca): this is pretty iffy. In the long term we should make
+    // HIR ty lowering able to return `Error` versions of types/consts when
+    // lowering them in contexts that aren't supposed to use generic parameters.
+    //
+    // This current impl strategy is incomplete and doesn't handle `Self` ty aliases.
+    pub fn check_anon_const_invalid_param_uses(
         self,
         anon: LocalDefId,
     ) -> Result<(), ErrorGuaranteed> {