more anon const kind stuff

Author: BoxyUwU

compiler/rustc_trait_selection/src/traits/mod.rs

@@ -556,7 +556,9 @@ pub fn try_evaluate_const<'tcx>(
             //
             // FIXME: `const_eval_resolve_for_typeck` should probably just modify the env itself
             // instead of having this logic here
-            let (args, typing_env) = if tcx.features().generic_const_exprs() {
+            let (args, typing_env) = if tcx.def_kind(uv.def) == DefKind::AnonConst
+                && let ty::AnonConstKind::GCEConst = tcx.anon_const_kind(uv.def)
+            {
                 // We handle `generic_const_exprs` separately as reasonable ways of handling constants in the type system
                 // completely fall apart under `generic_const_exprs` and makes this whole function Really hard to reason
                 // about if you have to consider gce whatsoever.
@@ -598,11 +600,8 @@ pub fn try_evaluate_const<'tcx>(
                         .with_post_analysis_normalized(tcx);
                     (uv.args, typing_env)
                 }
-            } else if !tcx.features().min_generic_const_args()
-                && !tcx.features().associated_const_equality()
-                // We check for anon consts so that when `associated_const_equality` bounds are
-                // lowered on stable we still handle them correctly to avoid ICEs in CTFE.
-                && tcx.def_kind(uv.def) == DefKind::AnonConst
+            } else if tcx.def_kind(uv.def) == DefKind::AnonConst
+                && let ty::AnonConstKind::RepeatExprCount = tcx.anon_const_kind(uv.def)
             {
                 // FIXME: remove this when `const_evaluatable_unchecked` is a hard error.
                 //
@@ -634,11 +633,11 @@ pub fn try_evaluate_const<'tcx>(
                 (args, typing_env)
             } else {
                 // We are only dealing with "truly" generic/uninferred constants here:
-                // - `generic_const_exprs` has been handled separately in the first if
-                // - `min_const_generics` repeat expr count hacks have been handled in the previous if
+                // - GCEConsts have been separately handled
+                // - Repeat expr hacks have also been separately handled
+                // So we are free to simply defer evaluation here.
                 //
-                // So we are free to simply defer evaluation here. This does assume that `uv.args` has
-                // already been normalized.
+                // FIXME: This assumes the args already normalized
                 if uv.args.has_non_region_param() || uv.args.has_non_region_infer() {
                     return Err(EvaluateConstErr::HasGenericsOrInfers);
                 }