From e036c7f38e3b8b1f0b0e0ac1b4ef22fc6f16963b Mon Sep 17 00:00:00 2001
From: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com>
Date: Tue, 8 Jul 2025 17:18:02 -0700
Subject: Fix `extension` incorrectly interacting with `equality` and
 `type-coercion` constraints (#7578)

* fix problem

* cleanup comment

* format code

* make change more restrictive

* format code

* push logic update

* format code

* push test fix

* make test more general

---------

Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
---
 .../extensions/extension-with-where-clause-1.slang | 49 +++++++++++++++++++++
 .../extensions/extension-with-where-clause-2.slang | 50 ++++++++++++++++++++++
 .../extensions/extension-with-where-clause-3.slang | 41 ++++++++++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 tests/language-feature/extensions/extension-with-where-clause-1.slang
 create mode 100644 tests/language-feature/extensions/extension-with-where-clause-2.slang
 create mode 100644 tests/language-feature/extensions/extension-with-where-clause-3.slang

(limited to 'tests')

diff --git a/tests/language-feature/extensions/extension-with-where-clause-1.slang b/tests/language-feature/extensions/extension-with-where-clause-1.slang
new file mode 100644
index 000000000..9facb8aa3
--- /dev/null
+++ b/tests/language-feature/extensions/extension-with-where-clause-1.slang
@@ -0,0 +1,49 @@
+//TEST:SIMPLE(filecheck=CHECK_FAIL): -target spirv -entry computeMain -stage compute -DFAIL
+//TEST:SIMPLE(filecheck=CHECK_PASS): -target spirv -entry computeMain -stage compute
+//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=CHECK): -slang -compute -shaderobj -output-using-type
+
+interface ITwoParamGeneric<A, B>
+{
+    int getVal();
+}
+
+struct Foo<A, B> : ITwoParamGeneric<A, B>
+{
+    int val = 0;
+    int getVal()
+    {
+       return val; 
+    }
+}
+
+extension<A, B> Foo<A,B> where A == B
+{
+    [mutating]
+    void setVal(int dataIn)
+    {
+        val = dataIn;
+    }
+}
+
+void test<A, B>(Foo<A,B> x) where A == B
+{
+}
+
+//TEST_INPUT: set outBuffer = out ubuffer(data=[0 0 0 0], stride=4)
+RWStructuredBuffer<float4> outBuffer;
+
+void computeMain()
+{
+//CHECK_FAIL-DAG: error 30027:{{.*}}'setVal'{{.*}}'Foo<int, float>'.
+//CHECK_FAIL-DAG: error 39999: could not specialize generic for arguments of type
+//CHECK_PASS: OpEntryPoint
+//CHECK: 3
+#ifdef FAIL
+    Foo<int, float> x = Foo<int, float>();
+#else
+    Foo<int, int> x = Foo<int, int>();
+#endif
+    x.setVal(3);
+    test(x);
+    outBuffer[0] = x.getVal();
+}
\ No newline at end of file
diff --git a/tests/language-feature/extensions/extension-with-where-clause-2.slang b/tests/language-feature/extensions/extension-with-where-clause-2.slang
new file mode 100644
index 000000000..bbdfff630
--- /dev/null
+++ b/tests/language-feature/extensions/extension-with-where-clause-2.slang
@@ -0,0 +1,50 @@
+//TEST:SIMPLE(filecheck=CHECK_FAIL): -target spirv -entry computeMain -stage compute -DFAIL
+//TEST:SIMPLE(filecheck=CHECK_PASS): -target spirv -entry computeMain -stage compute
+//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=CHECK): -slang -compute -shaderobj -output-using-type
+
+interface ITwoParamGeneric<A, B>
+{
+    int getVal();
+}
+
+struct Foo<A, B> : ITwoParamGeneric<A, B>
+{
+    int val = 0;
+    int getVal()
+    {
+       return val; 
+    }
+}
+
+struct NotPrimitiveCastable
+{
+    double data;
+}
+
+extension<A, B> Foo<A,B> 
+    where int(A)
+#ifdef FAIL
+    where NotPrimitiveCastable(B)
+#else
+    where float(B)
+#endif
+{
+    [mutating]
+    void setVal(int dataIn)
+    {
+        val = dataIn;
+    }
+}
+
+//TEST_INPUT: set outBuffer = out ubuffer(data=[0 0 0 0], stride=4)
+RWStructuredBuffer<float4> outBuffer;
+
+void computeMain()
+{
+//CHECK_FAIL: error 30027:{{.*}}'setVal'{{.*}}'Foo<float, int>'.
+//CHECK_PASS: OpEntryPoint
+//CHECK: 3
+    Foo<float, int> x = Foo<float, int>();
+    x.setVal(3);
+    outBuffer[0] = x.getVal();
+}
\ No newline at end of file
diff --git a/tests/language-feature/extensions/extension-with-where-clause-3.slang b/tests/language-feature/extensions/extension-with-where-clause-3.slang
new file mode 100644
index 000000000..6a3574b2c
--- /dev/null
+++ b/tests/language-feature/extensions/extension-with-where-clause-3.slang
@@ -0,0 +1,41 @@
+//TEST:SIMPLE(filecheck=CHECK_FAIL): -target spirv -entry computeMain -stage compute -DFAIL
+//TEST:SIMPLE(filecheck=CHECK_PASS): -target spirv -entry computeMain -stage compute
+//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=CHECK): -slang -compute -shaderobj -output-using-type
+
+struct Foo<each A>
+{
+    int val = 0;
+    int getVal()
+    {
+       return val; 
+    }
+}
+
+extension<each A> Foo<A>
+    where A == int
+{
+    [mutating]
+    void setVal1(int dataIn)
+    {
+        val += dataIn;
+    }
+}
+
+//TEST_INPUT: set outBuffer = out ubuffer(data=[0 0 0 0], stride=4)
+RWStructuredBuffer<float4> outBuffer;
+
+void computeMain()
+{
+//CHECK_FAIL: error 30027: 'setVal1'{{.*}}'Foo<float>'
+//CHECK_PASS: OpEntryPoint
+//CHECK: 3
+#ifdef FAIL
+    // fails since while expanding A and applying `where`,
+    // we will find a `float`, not a `int`
+    Foo<float> x = Foo<float>();
+#else
+    Foo<int> x = Foo<int>();
+#endif
+    x.setVal1(3);
+    outBuffer[0] = x.getVal();
+}
\ No newline at end of file
-- 
cgit v1.2.3