perf+

Author: Nadrieril

compiler/rustc_middle/src/thir.rs

@@ -941,6 +941,13 @@ impl<'tcx> PatRangeBoundary<'tcx> {
         param_env: ty::ParamEnv<'tcx>,
     ) -> u128 {
         match self {
+            Self::Finite {
+                value: mir::Const::Val(mir::ConstValue::Scalar(Scalar::Int(scalar_int)), _),
+            } => scalar_int.assert_bits(scalar_int.size()),
+            Self::Finite {
+                value: mir::Const::Ty(c),
+            } if let ty::ConstKind::Value(ty::ValTree::Leaf(scalar_int)) = c.kind()
+              => scalar_int.assert_bits(scalar_int.size()),
             Self::Finite { value } => value.eval_bits(tcx, param_env),
             // Self::NegInfinity => {
             //     // Unwrap is ok because the type is known to be numeric.
@@ -977,10 +984,6 @@ impl<'tcx> PatRangeBoundary<'tcx> {
             {
                 return Some(a.kind().cmp(&b.kind()));
             }
-            (
-                Finite { value: mir::Const::Val(mir::ConstValue::Scalar(Scalar::Int(a)), _) },
-                Finite { value: mir::Const::Val(mir::ConstValue::Scalar(Scalar::Int(b)), _) },
-            ) if matches!(ty.kind(), ty::Uint(_) | ty::Char) => return Some(a.cmp(&b)),
             _ => {}
         }