fix: merge expr bindings with instantiations bindings during monomorphization (#8713)

Author: asterite

compiler/noirc_frontend/src/monomorphization/mod.rs

@@ -2511,7 +2511,7 @@ pub fn perform_impl_bindings(
 }
 
 pub fn resolve_trait_method(
-    interner: &NodeInterner,
+    interner: &mut NodeInterner,
     method: TraitMethodId,
     expr_id: ExprId,
 ) -> Result<node_interner::FuncId, InterpreterError> {
@@ -2531,7 +2531,14 @@ pub fn resolve_trait_method(
                 &trait_generics.ordered,
                 &trait_generics.named,
             ) {
-                Ok((TraitImplKind::Normal(impl_id), _instantiation_bindings)) => impl_id,
+                Ok((TraitImplKind::Normal(impl_id), instantiation_bindings)) => {
+                    // Insert any additional instantiation bindings into this expression's instantiation bindings.
+                    // This is similar to what's done in `verify_trait_constraint` in the frontend.
+                    let mut bindings = interner.get_instantiation_bindings(expr_id).clone();
+                    bindings.extend(instantiation_bindings);
+                    interner.store_instantiation_bindings(expr_id, bindings);
+                    impl_id
+                }
                 Ok((TraitImplKind::Assumed { .. }, _instantiation_bindings)) => {
                     return Err(InterpreterError::NoImpl { location });
                 }

…mpile_success_empty/serialize/Nargo.toml …ile_success_empty/serialize_1/Nargo.tomltest_programs/compile_success_empty/serialize/Nargo.toml renamed to test_programs/compile_success_empty/serialize_1/Nargo.toml test_programs/compile_success_empty/serialize/Nargo.toml renamed to test_programs/compile_success_empty/serialize_1/Nargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "serialize"
+name = "serialize_1"
 type = "bin"
 authors = [""]
 compiler_version = ">=0.32.0"

test_programs/compile_success_empty/serialize_1/src/main.nr

@@ -0,0 +1,64 @@
+trait Serialize {
+    let Size: u32;
+
+    // Note that Rust disallows referencing constants here!
+    fn serialize(self) -> [Field; Self::Size];
+}
+
+impl<A, B> Serialize for (A, B)
+where
+    A: Serialize,
+    B: Serialize,
+{
+    let Size = <A as Serialize>::Size + <B as Serialize>::Size;
+
+    fn serialize(self: Self) -> [Field; Self::Size] {
+        let mut array: [Field; Self::Size] = std::mem::zeroed();
+        let a = self.0.serialize();
+        let b = self.1.serialize();
+
+        for i in 0..a.len() {
+            array[i] = a[i];
+        }
+        for i in 0..b.len() {
+            array[i + a.len()] = b[i];
+        }
+        array
+    }
+}
+
+impl<T, let N: u32> Serialize for [T; N]
+where
+    T: Serialize,
+{
+    let Size = <T as Serialize>::Size * N;
+
+    fn serialize(self: Self) -> [Field; Self::Size] {
+        let mut array: [Field; Self::Size] = std::mem::zeroed();
+        let mut array_i = 0;
+
+        for elem in self {
+            let elem_fields = elem.serialize();
+
+            for i in 0..elem_fields.len() {
+                array[array_i] = elem_fields[i];
+                array_i += 1;
+            }
+        }
+
+        array
+    }
+}
+
+impl Serialize for Field {
+    let Size: u32 = 1;
+
+    fn serialize(self) -> [Field; Self::Size] {
+        [self]
+    }
+}
+
+fn main() {
+    let x = (((1, [2, 3, 4]), [5, 6, 7, 8]), 9);
+    assert_eq(x.serialize().len(), 9);
+}

test_programs/compile_success_empty/serialize_2/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "serialize_2"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.32.0"
+
+[dependencies]

test_programs/compile_success_empty/serialize_2/src/main.nr

@@ -0,0 +1,27 @@
+trait Serialize {
+    let Size: u32;
+
+    fn serialize(self);
+}
+
+impl Serialize for Field {
+    let Size: u32 = 1;
+
+    fn serialize(self) {}
+}
+
+impl<A> Serialize for (A,)
+where
+    A: Serialize,
+{
+    let Size = <A as Serialize>::Size;
+
+    fn serialize(self: Self) {
+        self.0.serialize();
+    }
+}
+
+fn main() {
+    let x = ((1,),);
+    x.serialize();
+}

test_programs/compile_success_empty/serialize_3/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "serialize_3"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.32.0"
+
+[dependencies]

test_programs/compile_success_empty/serialize_3/src/main.nr

@@ -0,0 +1,42 @@
+trait Serialize {
+    let Size: u32;
+
+    fn serialize(self) -> [Field; Self::Size];
+}
+
+impl<A, B> Serialize for (A, B)
+where
+    A: Serialize,
+    B: Serialize,
+{
+    let Size = <A as Serialize>::Size + <B as Serialize>::Size;
+
+    fn serialize(self: Self) -> [Field; Self::Size] {
+        let _ = self.0.serialize();
+        [0; Self::Size]
+    }
+}
+
+impl<T, let N: u32> Serialize for [T; N]
+where
+    T: Serialize,
+{
+    let Size = <T as Serialize>::Size * N;
+
+    fn serialize(self: Self) -> [Field; Self::Size] {
+        [0; Self::Size]
+    }
+}
+
+impl Serialize for Field {
+    let Size: u32 = 1;
+
+    fn serialize(self) -> [Field; Self::Size] {
+        [self]
+    }
+}
+
+fn main() {
+    let x = (((1, [2, 3, 4]), [5, 6, 7, 8]), 9);
+    assert_eq(x.serialize().len(), 9);
+}

test_programs/compile_success_empty/serialize_4/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "serialize_4"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.32.0"
+
+[dependencies]

…pile_success_empty/serialize/src/main.nr …le_success_empty/serialize_4/src/main.nrtest_programs/compile_success_empty/serialize/src/main.nr renamed to test_programs/compile_success_empty/serialize_4/src/main.nr test_programs/compile_success_empty/serialize/src/main.nr renamed to test_programs/compile_success_empty/serialize_4/src/main.nr

@@ -59,6 +59,6 @@ impl Serialize for Field {
 }
 
 fn main() {
-    let x = ((1, [2, 3, 4]), [5, 6, 7, 8]);
-    assert_eq(x.serialize().len(), 8);
+    let x = (1, [2, 3, 4]);
+    assert_eq(x.serialize().len(), 4);
 }

tooling/nargo_cli/build.rs

@@ -145,7 +145,7 @@ const TESTS_WITHOUT_STDOUT_CHECK: [&str; 0] = [];
 /// These tests are ignored because of existing bugs in `nargo expand`.
 /// As the bugs are fixed these tests should be removed from this list.
 /// (some are ignored on purpose for the same reason as `IGNORED_NARGO_EXPAND_EXECUTION_TESTS`)
-const IGNORED_NARGO_EXPAND_COMPILE_SUCCESS_EMPTY_TESTS: [&str; 17] = [
+const IGNORED_NARGO_EXPAND_COMPILE_SUCCESS_EMPTY_TESTS: [&str; 20] = [
     // bug
     "associated_type_bounds",
     // bug
@@ -163,7 +163,13 @@ const IGNORED_NARGO_EXPAND_COMPILE_SUCCESS_EMPTY_TESTS: [&str; 17] = [
     // bug
     "regression_7038_4",
     // bug
-    "serialize",
+    "serialize_1",
+    // bug
+    "serialize_2",
+    // bug
+    "serialize_3",
+    // bug
+    "serialize_4",
     // bug
     "trait_allowed_item_name_matches",
     // bug