Add more tests.

Author: csyonghe

source/slang/slang-check-decl.cpp

@@ -2049,7 +2049,8 @@ namespace Slang
             }
             return varTypeTags.value();
         };
-        if (auto parentDecl = as<AggTypeDecl>(getParentDecl(varDecl)))
+        auto parentDecl = as<AggTypeDecl>(getParentDecl(varDecl));
+        if (parentDecl)
         {
             parentDecl->addTag(getVarTypeTags());
             bool isUnsized = (((int)getVarTypeTags() & (int)TypeTag::Unsized) != 0);
@@ -2073,14 +2074,14 @@ namespace Slang
                 }
             }
         }
-        bool isGlobalVar = (isGlobalDecl(varDecl) && !isGlobalShaderParameter(varDecl))
-            || (!as<ParamDecl>(varDecl) && varDecl->hasModifier<HLSLStaticModifier>());
-        if (isGlobalVar)
+        bool isGlobalOrLocalVar = !isGlobalShaderParameter(varDecl) && !as<ParamDecl>(varDecl) &&
+            (!parentDecl || isEffectivelyStatic(varDecl));
+        if (isGlobalOrLocalVar)
         {
             bool isUnsized = (((int)getVarTypeTags() & (int)TypeTag::Unsized) != 0);
             if (isUnsized)
             {
-                getSink()->diagnose(varDecl, Diagnostics::globalVarCannotBeUnsized);
+                getSink()->diagnose(varDecl, Diagnostics::varCannotBeUnsized);
             }
         }
 

source/slang/slang-diagnostic-defs.h

@@ -326,7 +326,7 @@ DIAGNOSTIC(30067, Error, mutatingMethodOnFunctionInputParameterError, "mutating
 DIAGNOSTIC(30068, Warning, mutatingMethodOnFunctionInputParameterWarning, "mutating method '$0' called on `in` parameter '$1'; changes will not be visible to caller. copy the parameter into a local variable if this behavior is intended")
 
 DIAGNOSTIC(30070, Error, unsizedMemberMustAppearLast, "unsized member can only appear as the last member in a composite type.")
-DIAGNOSTIC(30071, Error, globalVarCannotBeUnsized, "global or static variable cannot not be unsized.")
+DIAGNOSTIC(30071, Error, varCannotBeUnsized, "cannot instantiate a variable of unsized type.")
 
 DIAGNOSTIC(30075, Error, cannotSpecializeGeneric, "cannot specialize generic '$0' with the provided arguments.")
 

tests/bugs/gh-4150.slang

@@ -1,13 +1,11 @@
 //TEST:SIMPLE(filecheck=CHECK1):-target spirv -DERROR1
 //TEST:SIMPLE(filecheck=CHECK2):-target spirv -DERROR2
 
-// CHECK1: error 30075
-// CHECK2: error 30071
-
 struct RWTex<T : __BuiltinRealType, let N : uint>
 {
 #ifdef ERROR2
     // expect error: cannot define static member with unsized type.
+    // CHECK2:([[# @LINE+1]]): error 30071
     static [[vk::binding(0, 0)]] vector<T,N> rwtable[];
 #else
     static [[vk::binding(0, 0)]] vector<T,N> rwtable[4];
@@ -25,11 +23,23 @@ RWStructuredBuffer<float3> output;
 [numthreads(8, 8, 1)]
 void main(uint3 pixel_i : SV_DispatchThreadID)
 {
-    output[0] = 
+    output[0] =
 #ifdef ERROR1
-    // expect error: trying to specialize RWTex, which has two arguments, with only one argument.
-    RWTex<float3>::get(p.image_id);
+        // expect error: trying to specialize RWTex, which has two arguments, with only one argument.
+        // CHECK1:([[# @LINE+1]]): error 30075
+        RWTex<float3>::get(p.image_id);
 #else
-    RWTex<float,3>::get(p.image_id);
+        RWTex<float, 3>::get(p.image_id);
 #endif
+    //CHECK1:([[# @LINE+1]]): error 30071
+    static float sa1[];
+
+    //CHECK1:([[# @LINE+1]]): error 30071
+    float sa2[];
+
+    //CHECK1-NOT:([[# @LINE+1]]): error
+    static float sa3[] = { 1, 2, 3 }; // should be ok.
+
+    //CHECK1-NOT:([[# @LINE+1]]): error
+    float sa4[] = { 1, 2, 3 }; // should be ok.
 }