Auto merge of #105384 - uweigand:s390x-test-codegen, r=Mark-Simulacrum

[rust.git] / compiler / rustc_trait_selection / src / traits / const_evaluatable.rs

diff --git a/compiler/rustc_trait_selection/src/traits/const_evaluatable.rs b/compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
index d01c6bac2963be6e0329a384d4bfc4957689d2e7..7c9fde27420bc2b12ba79a6d08083b507dc2b8ec 100644 (file)
--- a/compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
+++ b/compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
@@ -30,7 +30,7 @@ pub fn is_const_evaluatable<'tcx>(
     span: Span,
 ) -> Result<(), NotConstEvaluatable> {
     let tcx = infcx.tcx;
-    match unexpanded_ct.kind() {
+    match tcx.expand_abstract_consts(unexpanded_ct).kind() {
         ty::ConstKind::Unevaluated(_) | ty::ConstKind::Expr(_) => (),
         ty::ConstKind::Param(_)
         | ty::ConstKind::Bound(_, _)
@@ -64,7 +64,7 @@ pub fn is_const_evaluatable<'tcx>(
             ty::ConstKind::Expr(_) => {
                 // FIXME(generic_const_exprs): we have a `ConstKind::Expr` which is fully concrete, but
                 // currently it is not possible to evaluate `ConstKind::Expr` so we are unable to tell if it
-                // is evaluatable or not. For now we just ICE until this is implemented this.
+                // is evaluatable or not. For now we just ICE until this is implemented.
                 Err(NotConstEvaluatable::Error(tcx.sess.delay_span_bug(
                     span,
                     "evaluating `ConstKind::Expr` is not currently supported",