diff options
| -rw-r--r-- | compiler/rustc_mir_build/src/build/matches/test.rs | 14 | ||||
| -rw-r--r-- | compiler/rustc_mir_build/src/thir/pattern/deconstruct_pat.rs | 10 | ||||
| -rw-r--r-- | compiler/rustc_mir_build/src/thir/pattern/mod.rs | 5 |
3 files changed, 8 insertions, 21 deletions
diff --git a/compiler/rustc_mir_build/src/build/matches/test.rs b/compiler/rustc_mir_build/src/build/matches/test.rs index d98837ad7df..598da80c574 100644 --- a/compiler/rustc_mir_build/src/build/matches/test.rs +++ b/compiler/rustc_mir_build/src/build/matches/test.rs @@ -639,16 +639,13 @@ impl<'a, 'tcx> Builder<'a, 'tcx> { return Some(0); } - let tcx = self.tcx; - let test_ty = test.lo.ty(); - // For performance, it's important to only do the second // `compare_const_vals` if necessary. let no_overlap = if matches!( - (compare_const_vals(tcx, test.hi, pat.lo, self.param_env, test_ty)?, test.end), + (compare_const_vals(self.tcx, test.hi, pat.lo, self.param_env)?, test.end), (Less, _) | (Equal, RangeEnd::Excluded) // test < pat ) || matches!( - (compare_const_vals(tcx, test.lo, pat.hi, self.param_env, test_ty)?, pat.end), + (compare_const_vals(self.tcx, test.lo, pat.hi, self.param_env)?, pat.end), (Greater, _) | (Equal, RangeEnd::Excluded) // test > pat ) { Some(1) @@ -762,15 +759,12 @@ impl<'a, 'tcx> Builder<'a, 'tcx> { ) -> Option<bool> { use std::cmp::Ordering::*; - let tcx = self.tcx; - let param_env = self.param_env; - let ty = range.lo.ty(); // For performance, it's important to only do the second // `compare_const_vals` if necessary. Some( - matches!(compare_const_vals(tcx, range.lo, value, param_env, ty)?, Less | Equal) + matches!(compare_const_vals(self.tcx, range.lo, value, self.param_env)?, Less | Equal) && matches!( - (compare_const_vals(tcx, value, range.hi, param_env, ty)?, range.end), + (compare_const_vals(self.tcx, value, range.hi, self.param_env)?, range.end), (Less, _) | (Equal, RangeEnd::Included) ), ) diff --git a/compiler/rustc_mir_build/src/thir/pattern/deconstruct_pat.rs b/compiler/rustc_mir_build/src/thir/pattern/deconstruct_pat.rs index d97da1c8e1d..60db98073a3 100644 --- a/compiler/rustc_mir_build/src/thir/pattern/deconstruct_pat.rs +++ b/compiler/rustc_mir_build/src/thir/pattern/deconstruct_pat.rs @@ -828,14 +828,8 @@ impl<'tcx> Constructor<'tcx> { FloatRange(other_from, other_to, other_end), ) => { match ( - compare_const_vals(pcx.cx.tcx, *self_to, *other_to, pcx.cx.param_env, pcx.ty), - compare_const_vals( - pcx.cx.tcx, - *self_from, - *other_from, - pcx.cx.param_env, - pcx.ty, - ), + compare_const_vals(pcx.cx.tcx, *self_to, *other_to, pcx.cx.param_env), + compare_const_vals(pcx.cx.tcx, *self_from, *other_from, pcx.cx.param_env), ) { (Some(to), Some(from)) => { (from == Ordering::Greater || from == Ordering::Equal) diff --git a/compiler/rustc_mir_build/src/thir/pattern/mod.rs b/compiler/rustc_mir_build/src/thir/pattern/mod.rs index 3e5e12d2286..a72af8be83e 100644 --- a/compiler/rustc_mir_build/src/thir/pattern/mod.rs +++ b/compiler/rustc_mir_build/src/thir/pattern/mod.rs @@ -128,7 +128,7 @@ impl<'a, 'tcx> PatCtxt<'a, 'tcx> { ) -> PatKind<'tcx> { assert_eq!(lo.ty(), ty); assert_eq!(hi.ty(), ty); - let cmp = compare_const_vals(self.tcx, lo, hi, self.param_env, ty); + let cmp = compare_const_vals(self.tcx, lo, hi, self.param_env); match (end, cmp) { // `x..y` where `x < y`. // Non-empty because the range includes at least `x`. @@ -752,15 +752,14 @@ pub(crate) fn compare_const_vals<'tcx>( a: mir::ConstantKind<'tcx>, b: mir::ConstantKind<'tcx>, param_env: ty::ParamEnv<'tcx>, - ty: Ty<'tcx>, ) -> Option<Ordering> { assert_eq!(a.ty(), b.ty()); - assert_eq!(a.ty(), ty); if a == b { return Some(Ordering::Equal); } + let ty = a.ty(); let a_bits = a.try_eval_bits(tcx, param_env, ty); let b_bits = b.try_eval_bits(tcx, param_env, ty); |