From 2cb1ef8a0ca6f356f95895018231bf25632334ce Mon Sep 17 00:00:00 2001
From: Jake Fecher <jfecher11@gmail.com>
Date: Fri, 2 Aug 2024 10:22:23 -0500
Subject: [PATCH] Fix where clause issue

---
 compiler/noirc_frontend/src/elaborator/mod.rs |  5 +++++
 .../src/hir/def_collector/dc_mod.rs           |  2 --
 .../regression_5671/Nargo.toml                |  7 +++++++
 .../regression_5671/src/main.nr               | 20 +++++++++++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 test_programs/compile_success_empty/regression_5671/Nargo.toml
 create mode 100644 test_programs/compile_success_empty/regression_5671/src/main.nr

diff --git a/compiler/noirc_frontend/src/elaborator/mod.rs b/compiler/noirc_frontend/src/elaborator/mod.rs
index e7f53ebb916..cca2af56664 100644
--- a/compiler/noirc_frontend/src/elaborator/mod.rs
+++ b/compiler/noirc_frontend/src/elaborator/mod.rs
@@ -1300,6 +1300,11 @@ impl<'context> Elaborator<'context> {
             self.add_generics(&trait_impl.generics);
             trait_impl.resolved_generics = self.generics.clone();
 
+            for (_, _, method) in trait_impl.methods.functions.iter_mut() {
+                // Attach any trait constraints on the impl to the function
+                method.def.where_clause.append(&mut trait_impl.where_clause.clone());
+            }
+
             // Fetch trait constraints here
             let trait_generics = trait_impl
                 .trait_id
diff --git a/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs b/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs
index 9eef1d7b77e..be2afd13507 100644
--- a/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs
+++ b/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs
@@ -173,8 +173,6 @@ impl<'a> ModCollector<'a> {
             let module = ModuleId { krate, local_id: self.module_id };
 
             for (_, func_id, noir_function) in &mut unresolved_functions.functions {
-                // Attach any trait constraints on the impl to the function
-                noir_function.def.where_clause.append(&mut trait_impl.where_clause.clone());
                 let location = Location::new(noir_function.def.span, self.file_id);
                 context.def_interner.push_function(*func_id, &noir_function.def, module, location);
             }
diff --git a/test_programs/compile_success_empty/regression_5671/Nargo.toml b/test_programs/compile_success_empty/regression_5671/Nargo.toml
new file mode 100644
index 00000000000..4ddf3413e5e
--- /dev/null
+++ b/test_programs/compile_success_empty/regression_5671/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "regression_5671"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.32.0"
+
+[dependencies]
diff --git a/test_programs/compile_success_empty/regression_5671/src/main.nr b/test_programs/compile_success_empty/regression_5671/src/main.nr
new file mode 100644
index 00000000000..2bac98ef7c4
--- /dev/null
+++ b/test_programs/compile_success_empty/regression_5671/src/main.nr
@@ -0,0 +1,20 @@
+#[foo]
+struct MyOtherStruct<A, B> {
+    field1: A,
+    field2: B,
+}
+
+comptime fn foo(_s: StructDefinition) -> Quoted {
+    quote {
+        impl<A, B> Eq for MyOtherStruct<A, B> where A: Eq, B: Eq {
+            fn eq(self, other: Self) -> bool {
+                (self.field1 == other.field1) & (self.field2 == other.field2)
+            }
+        }
+    }
+}
+
+fn main() {
+    let x = MyOtherStruct { field1: 1, field2: 2 };
+    assert_eq(x, x);
+}