4 files changed, 50 insertions, 6 deletions
diff --git a/tests/experiments/generic/meta-2.slang b/tests/bugs/meta-2.slang
index 98ae09ce5..6dd5541c4 100644
--- a/tests/experiments/generic/meta-2.slang
+++ b/tests/bugs/meta-2.slang
@@ -1,9 +1,4 @@
-//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj
-
-/* A test meta programing.
-
-CRASHES the compiler(!). Stack overrun.
- */
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/bugs/meta-2.slang.expected.txt b/tests/bugs/meta-2.slang.expected.txt
new file mode 100644
index 000000000..f7bacac93
--- /dev/null
+++ b/tests/bugs/meta-2.slang.expected.txt
@@ -0,0 +1,4 @@
+A
+A
+A
+A
diff --git a/tests/experiments/generic/generic-func-static-const-var.slang b/tests/experiments/generic/generic-func-static-const-var.slang
new file mode 100644
index 000000000..2c8ea0398
--- /dev/null
+++ b/tests/experiments/generic/generic-func-static-const-var.slang
@@ -0,0 +1,24 @@
+//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -Xslang -dump-ir
+
+/* Doesn't work correctly failing in emit with a 'generic' instruction that is not expected. */
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+    
+struct GetValue2<let N : int>
+{
+    static int getValue()
+    {
+        static const int v = N;
+        return v;
+    }
+};    
+  
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{    
+    int index = dispatchThreadID.x;
+
+	outputBuffer[index] = GetValue2<20>::getValue(); 
+}
+
diff --git a/tests/experiments/generic/generic-struct-func-static-const-var.slang b/tests/experiments/generic/generic-struct-func-static-const-var.slang
new file mode 100644
index 000000000..db6fc6225
--- /dev/null
+++ b/tests/experiments/generic/generic-struct-func-static-const-var.slang
@@ -0,0 +1,21 @@
+//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -Xslang -dump-ir
+
+/* Doesn't work correctly failing in emit with a 'generic' instruction that is not expected. */
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+static int getValue<let N: int>()
+{
+    static const int v = N;
+    return v;
+}
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{    
+    int index = dispatchThreadID.x;
+
+	outputBuffer[index] = getValue<10>();
+}
+