Fix crash when using optional type in a generic. (#4341)

2 files changed, 64 insertions, 0 deletions

diff --git a/tests/bugs/optional-generic.slang b/tests/bugs/optional-generic.slang
new file mode 100644
index 000000000..16b466273
--- /dev/null
+++ b/tests/bugs/optional-generic.slang
@@ -0,0 +1,22 @@
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-slang -compute
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-slang -compute -vk
+
+
+Optional<T> genFunc<T : IArithmetic>(T v)
+{
+    if (v is int)
+        return v;
+    return none;
+}
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name buffer
+
+RWStructuredBuffer<int> buffer;
+
+[numthreads(1,1,1)]
+void computeMain()
+{
+    // BUF: 2
+    buffer[0] = genFunc(2).value;
+}
+
diff --git a/tests/bugs/optional.slang b/tests/bugs/optional.slang
new file mode 100644
index 000000000..3512ba29f
--- /dev/null
+++ b/tests/bugs/optional.slang
@@ -0,0 +1,42 @@
+//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-slang -compute
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-slang -compute -vk
+
+interface IFoo
+{
+    void foo();
+}
+
+struct S : IFoo { int x; void foo(); }
+
+struct P
+{
+    IFoo f;
+}
+struct Tr
+{
+    int test<T:IArithmetic>(T t, inout P p)
+    {
+        const IFoo hit = p.f;
+        let castResult = hit as S;
+        if (!castResult.hasValue)
+            return 0;
+        return castResult.value.x;
+    }
+}
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name buffer
+
+RWStructuredBuffer<int> buffer;
+
+[numthreads(1,1,1)]
+void computeMain()
+{
+    P p;
+    S s;
+    s.x = 2;
+    p.f = s;
+    Tr tt;
+    // BUF: 2
+    buffer[0] = tt.test(0, p);
+}
+