From 94b2c676662ef581b5de3baa6cde076fe07ef26b Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <ellieh@nvidia.com>
Date: Sat, 11 Feb 2023 13:57:35 +0800
Subject: Take into account existing initializer list type when performing
 coercions (#2641)

Fixes https://github.com/shader-slang/slang/issues/2189
---
 tests/bugs/c-style-cast-coerce.slang               | 17 ++++++++++++
 tests/bugs/c-style-cast-coerce.slang.expected      |  8 ++++++
 tests/bugs/c-style-cast-overload.slang             | 30 ++++++++++++++++++++++
 .../bugs/c-style-cast-overload.slang.expected.txt  |  4 +++
 4 files changed, 59 insertions(+)
 create mode 100644 tests/bugs/c-style-cast-coerce.slang
 create mode 100644 tests/bugs/c-style-cast-coerce.slang.expected
 create mode 100644 tests/bugs/c-style-cast-overload.slang
 create mode 100644 tests/bugs/c-style-cast-overload.slang.expected.txt

(limited to 'tests')

diff --git a/tests/bugs/c-style-cast-coerce.slang b/tests/bugs/c-style-cast-coerce.slang
new file mode 100644
index 000000000..e01903e2c
--- /dev/null
+++ b/tests/bugs/c-style-cast-coerce.slang
@@ -0,0 +1,17 @@
+//TEST:SIMPLE:
+
+// It used to be the case that coercions of already-coerced initializer lists
+// didn't take into account the more specific type. One way of triggering this
+// was to create an already-coerced initializer list via the HLSL `(S)0`
+// syntax which creates the equivalent of `{} : S`. In the example below this
+// then proceeds to be coerced to type T.
+
+struct S {};
+struct T {};
+
+void main()
+{
+    // Should generate a type error.
+    T t = (S)0;
+}
+
diff --git a/tests/bugs/c-style-cast-coerce.slang.expected b/tests/bugs/c-style-cast-coerce.slang.expected
new file mode 100644
index 000000000..a09c6842f
--- /dev/null
+++ b/tests/bugs/c-style-cast-coerce.slang.expected
@@ -0,0 +1,8 @@
+result code = -1
+standard error = {
+tests/bugs/c-style-cast-coerce.slang(15): error 30019: expected an expression of type 'T', got 'S'
+    T t = (S)0;
+          ^
+}
+standard output = {
+}
diff --git a/tests/bugs/c-style-cast-overload.slang b/tests/bugs/c-style-cast-overload.slang
new file mode 100644
index 000000000..058394271
--- /dev/null
+++ b/tests/bugs/c-style-cast-overload.slang
@@ -0,0 +1,30 @@
+// https://github.com/shader-slang/slang/issues/2189
+// See also ./c-style-cast-coerce.slang which represents the essence of this bug
+
+//TEST(compute):COMPARE_COMPUTE: -shaderobj
+//TEST(compute):COMPARE_COMPUTE: -shaderobj -vulkan
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+struct S {};
+
+int f(S)
+{
+    return 1;
+}
+
+int f(float)
+{
+    return 2;
+}
+
+[shader("compute")]
+[numthreads(1,1,1)]
+void computeMain()
+{
+    outputBuffer[0] = f(float(0));
+    outputBuffer[1] = f((float)1);
+    outputBuffer[2] = f((float)0);
+    outputBuffer[3] = f((S)0);
+}
diff --git a/tests/bugs/c-style-cast-overload.slang.expected.txt b/tests/bugs/c-style-cast-overload.slang.expected.txt
new file mode 100644
index 000000000..5b3c1b7c0
--- /dev/null
+++ b/tests/bugs/c-style-cast-overload.slang.expected.txt
@@ -0,0 +1,4 @@
+2
+2
+2
+1
-- 
cgit v1.2.3