fix: Fix an ICE when reassigning a mutable lambda variable to one wit…

…h a different environment type (#2172) * fix: don't allow lambda reassignment if closure types dont match * fix: add test for bad lambda reassignment * fix: cargo fmt & clippy * fix: alternate approach --------- Co-authored-by: Alex Vitkov <[email protected]>
noir-lang · Aug 7, 2023 · a56db3e · a56db3e
1 parent 14cbdbc
commit a56db3e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/crates/nargo_cli/tests/compile_tests_data/fail/different-lambda-env-reassign-disallow.nr b/crates/nargo_cli/tests/compile_tests_data/fail/different-lambda-env-reassign-disallow.nr
@@ -0,0 +1,9 @@
+fn bad()  {
+    let a: i32 = 100;
+    let b: i32 = 200;
+
+    let mut f = || a;
+
+    // this should fail with a type error, since the closures have different environments & types
+    f = || a + b; 
+}
diff --git a/crates/noirc_frontend/src/hir_def/types.rs b/crates/noirc_frontend/src/hir_def/types.rs
@@ -1206,12 +1206,14 @@ impl Type {
                 }
             }
 
-            (Function(params_a, ret_a, _env_a), Function(params_b, ret_b, _env_b)) => {
+            (Function(params_a, ret_a, env_a), Function(params_b, ret_b, env_b)) => {
                 if params_a.len() == params_b.len() {
                     for (a, b) in params_a.iter().zip(params_b.iter()) {
                         a.try_unify(b, span)?;
                     }
 
+                    env_a.try_unify(env_b, span)?;
+
                     ret_b.try_unify(ret_a, span)
                 } else {
                     Err(SpanKind::None)
@@ -1413,12 +1415,14 @@ impl Type {
                 }
             }
 
-            (Function(params_a, ret_a, _env_a), Function(params_b, ret_b, _env_b)) => {
+            (Function(params_a, ret_a, env_a), Function(params_b, ret_b, env_b)) => {
                 if params_a.len() == params_b.len() {
                     for (a, b) in params_a.iter().zip(params_b) {
                         a.is_subtype_of(b, span)?;
                     }
 
+                    env_a.is_subtype_of(env_b, span)?;
+
                     // return types are contravariant, so this must be ret_b <: ret_a instead of the reverse
                     ret_b.is_subtype_of(ret_a, span)
                 } else {