chore: convert Intrinsic::ApplyRangeConstraint into `Instruction::R…

…angeCheck`
noir-lang · Jan 11, 2024 · e016972 · e016972
1 parent 1927658
commit e016972
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs b/compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs
@@ -1713,18 +1713,7 @@ impl Context {
                 Ok(Self::convert_vars_to_values(vars, dfg, result_ids))
             }
             Intrinsic::ApplyRangeConstraint => {
-                let field = self.convert_value(arguments[0], dfg).into_var()?;
-
-                let bit_size = self.convert_value(arguments[1], dfg).into_var()?;
-                let bit_size = self.acir_context.constant(bit_size).to_u128() as u32;
-
-                self.acir_context.range_constrain_var(
-                    field,
-                    &NumericType::Unsigned { bit_size },
-                    Some("call to apply_range_constraint".to_owned()),
-                )?;
-
-                Ok(Vec::new())
+                unreachable!("ICE: `Intrinsic::ApplyRangeConstraint` calls should be transformed into an `Instruction::RangeCheck`");
             }
             Intrinsic::ToRadix(endian) => {
                 let field = self.convert_value(arguments[0], dfg).into_var()?;

diff --git a/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs b/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs
@@ -233,7 +233,20 @@ pub(super) fn simplify_call(
                 SimplifyResult::None
             }
         }
-        Intrinsic::ApplyRangeConstraint => SimplifyResult::None,
+        Intrinsic::ApplyRangeConstraint => {
+            let value = arguments[0];
+            let max_bit_size = dfg.get_numeric_constant(arguments[1]);
+            if let Some(max_bit_size) = max_bit_size {
+                let max_bit_size = max_bit_size.to_u128() as u32;
+                SimplifyResult::SimplifiedToInstruction(Instruction::RangeCheck {
+                    value,
+                    max_bit_size,
+                    assert_message: Some("call to apply_range_constraint".to_owned()),
+                })
+            } else {
+                SimplifyResult::None
+            }
+        }
         Intrinsic::BlackBox(bb_func) => simplify_black_box_func(bb_func, arguments, dfg),
         Intrinsic::Sort => simplify_sort(dfg, arguments),
         Intrinsic::AsField => {

diff --git a/noir_stdlib/src/field.nr b/noir_stdlib/src/field.nr
@@ -20,7 +20,7 @@ impl Field {
 
     pub fn assert_maximum_bit_size(self: Self, bit_size: u32) {
         crate::assert_constant(bit_size);
-        assert(bit_size < modulus_num_bits());
+        assert(bit_size < modulus_num_bits() as u32);
         self.__assert_maximum_bit_size(bit_size);
     }