1 files changed, 6 insertions, 2 deletions
diff --git a/source/slang/slang-check-modifier.cpp b/source/slang/slang-check-modifier.cpp
index 53d121b4b..a9a8c19da 100644
--- a/source/slang/slang-check-modifier.cpp
+++ b/source/slang/slang-check-modifier.cpp
@@ -966,9 +966,9 @@ namespace Slang
         case ASTNodeType::HLSLColumnMajorLayoutModifier:
         case ASTNodeType::GLSLRowMajorLayoutModifier:
         case ASTNodeType::HLSLEffectSharedModifier:
-        case ASTNodeType::HLSLGroupSharedModifier:
         case ASTNodeType::HLSLVolatileModifier:
         case ASTNodeType::GLSLPrecisionModifier:
+        case ASTNodeType::HLSLGroupSharedModifier:
             return modifierType;
 
         case ASTNodeType::HLSLStaticModifier:
@@ -1081,12 +1081,16 @@ namespace Slang
         case ASTNodeType::HLSLColumnMajorLayoutModifier:
         case ASTNodeType::GLSLRowMajorLayoutModifier:
         case ASTNodeType::HLSLEffectSharedModifier:
-        case ASTNodeType::HLSLGroupSharedModifier:
         case ASTNodeType::HLSLVolatileModifier:
             return as<VarDeclBase>(decl) || as<GLSLInterfaceBlockDecl>(decl);
 
         case ASTNodeType::GLSLPrecisionModifier:
             return as<VarDeclBase>(decl) || as<GLSLInterfaceBlockDecl>(decl) || as<CallableDecl>(decl);
+        case ASTNodeType::HLSLGroupSharedModifier:
+            // groupshared must be global or static.
+            if (!as<VarDeclBase>(decl))
+                return false;
+            return isGlobalDecl(decl) || isEffectivelyStatic(decl);
         default:
             return true;
         }