Merge branch 'master' into bitzoic-6106

FuelLabs · Jun 13, 2024 · f39ae58 · f39ae58
2 parents 82094df + be5e134
commit f39ae58
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/sway-ir/src/optimize/constants.rs b/sway-ir/src/optimize/constants.rs
@@ -213,8 +213,8 @@ fn combine_binary_op(context: &mut Context, function: &Function) -> bool {
                         (Xor, Uint(l), Uint(r)) => Some(Uint(l ^ r)),
                         (Xor, U256(l), U256(r)) => Some(U256(l ^ r)),
 
-                        (Mod, Uint(l), Uint(r)) => Some(Uint(l % r)),
-                        (Mod, U256(l), U256(r)) => Some(U256(l % r)),
+                        (Mod, Uint(l), Uint(r)) => l.checked_rem(*r).map(Uint),
+                        (Mod, U256(l), U256(r)) => l.checked_rem(r).map(U256),
 
                         (Rsh, Uint(l), Uint(r)) => u32::try_from(*r)
                             .ok()
@@ -350,6 +350,7 @@ mod tests {
         assert_operator("u64", "sub", "0", Some("1"), None);
         assert_operator("u64", "mul", &u64::MAX.to_string(), Some("2"), None);
         assert_operator("u64", "div", "1", Some("0"), None);
+        assert_operator("u64", "mod", "1", Some("0"), None);
 
         assert_operator("u64", "rsh", "1", Some("64"), None);
         assert_operator("u64", "lsh", "1", Some("64"), None);

diff --git a/sway-types/src/u256.rs b/sway-types/src/u256.rs
@@ -47,6 +47,14 @@ impl U256 {
         let r = (&self.0).shl(other);
         (r.bits() <= 256).then_some(Self(r))
     }
+
+    pub fn checked_rem(&self, other: &U256) -> Option<U256> {
+        if other.0 == BigUint::ZERO {
+            None
+        } else {
+            Some(U256(&self.0 % &other.0))
+        }
+    }
 }
 
 impl std::fmt::Display for U256 {