fix: Fix modulo operator for comptime values (#1361)

use integer type for modulo simplification
noir-lang · May 17, 2023 · ba15d6d · ba15d6d
1 parent cfbc1f7
commit ba15d6d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/crates/nargo_cli/tests/test_data/2_div/src/main.nr b/crates/nargo_cli/tests/test_data/2_div/src/main.nr
@@ -3,4 +3,5 @@ fn main(mut x: u32, y: u32, z: u32) {
     let a = x % y;
     assert(x / y == z);
     assert(a == x - z*y);
+    assert((50 as u64) % (9 as u64) == 5);
 }
diff --git a/crates/noirc_evaluator/src/ssa/node.rs b/crates/noirc_evaluator/src/ssa/node.rs
@@ -922,7 +922,10 @@ impl Binary {
                 } else if l_is_zero {
                     return Ok(l_eval); //TODO what is the correct result?
                 } else if let (Some(lhs), Some(rhs)) = (lhs, rhs) {
-                    return Ok(NodeEval::Const(lhs - rhs * (lhs / rhs), res_type));
+                    let lhs = res_type.field_to_type(lhs).to_u128();
+                    let rhs = res_type.field_to_type(rhs).to_u128();
+                    let result = lhs - rhs * (lhs / rhs);
+                    return Ok(NodeEval::Const(FieldElement::from(result), res_type));
                 }
             }
             BinaryOp::Srem(loc) => {