Update compiler/noirc_evaluator/src/ssa/ir/instruction/binary.rs

Co-authored-by: jfecher <jake@aztecprotocol.com>
noir-lang · Apr 2, 2024 · 37345f4 · 37345f4
1 parent 0927c65
commit 37345f4
Showing 1 changed file with 9 additions and 22 deletions.
diff --git a/compiler/noirc_evaluator/src/ssa/ir/instruction/binary.rs b/compiler/noirc_evaluator/src/ssa/ir/instruction/binary.rs
@@ -174,28 +174,15 @@ impl Binary {
                 if operand_type.is_unsigned() {
                     // If we're comparing a variable against a constant value which lies outside of the range of
                     // values which the variable's type can take, we can assume that the equality will be false.
-                    match (lhs, rhs) {
-                        (Some(lhs), None) => {
-                            let max_possible_value =
-                                2u128.pow(dfg.get_value_max_num_bits(self.rhs)) - 1;
-                            if lhs > max_possible_value.into() {
-                                let zero = dfg.make_constant(FieldElement::zero(), Type::bool());
-                                return SimplifyResult::SimplifiedTo(zero);
-                            }
-                        }
-
-                        (None, Some(rhs)) => {
-                            let max_possible_value =
-                                2u128.pow(dfg.get_value_max_num_bits(self.lhs)) - 1;
-                            if rhs > max_possible_value.into() {
-                                let zero = dfg.make_constant(FieldElement::zero(), Type::bool());
-                                return SimplifyResult::SimplifiedTo(zero);
-                            }
-                        }
-
-                        (None, None) => (),
-                        (Some(_), Some(_)) => {
-                            unreachable!("Constant binary instructions should be handled above")
+                    let constant = lhs.or(rhs);
+                    let non_constant = if lhs.is_some() { self.rhs } else { self.lhs };
+
+                    if let Some(constant) = constant {
+                        let max_possible_value =
+                            2u128.pow(dfg.get_value_max_num_bits(non_constant)) - 1;
+                        if constant > max_possible_value.into() {
+                            let zero = dfg.make_constant(FieldElement::zero(), Type::bool());
+                            return SimplifyResult::SimplifiedTo(zero);
                         }
                     }
                 }