summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--source/slang/slang-check-expr.cpp4
-rw-r--r--tests/language-feature/nested-empty-initializer-list.slang25
2 files changed, 29 insertions, 0 deletions
diff --git a/source/slang/slang-check-expr.cpp b/source/slang/slang-check-expr.cpp
index d0b82c6bd..f79e23b42 100644
--- a/source/slang/slang-check-expr.cpp
+++ b/source/slang/slang-check-expr.cpp
@@ -4176,6 +4176,10 @@ namespace Slang
Expr* SemanticsExprVisitor::visitInitializerListExpr(InitializerListExpr* expr)
{
+ // If we are assigned a type, expr has already been legalized
+ if(expr->type)
+ return expr;
+
// When faced with an initializer list, we first just check the sub-expressions blindly.
// Actually making them conform to a desired type will wait for when we know the desired
// type based on context.
diff --git a/tests/language-feature/nested-empty-initializer-list.slang b/tests/language-feature/nested-empty-initializer-list.slang
new file mode 100644
index 000000000..4b1d9cd79
--- /dev/null
+++ b/tests/language-feature/nested-empty-initializer-list.slang
@@ -0,0 +1,25 @@
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-shaderobj
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-dx12 -use-dxil -shaderobj
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-cpu -shaderobj
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-vk -shaderobj
+
+//TEST_INPUT:ubuffer(data=[0], stride=4):out,name=outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+struct NestedStruct
+{
+ int data;
+};
+
+struct TopStruct
+{
+ NestedStruct nestedStruct = {};
+}
+
+[numthreads(1, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+ TopStruct val = {};
+// BUF: 1
+ outputBuffer[0] = val.nestedStruct.data == 0;
+}