From c4dd2eb0033b3eaf683791a6666cff63aeb9f139 Mon Sep 17 00:00:00 2001 From: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com> Date: Wed, 30 Jul 2025 14:23:27 -0700 Subject: disallow `static const` variables without default-value (#7993) * Fix static const variables without initializers causing internal errors Add validation in SemanticsDeclHeaderVisitor::checkVarDeclCommon to detect static const variables without initializers and emit proper error diagnostics instead of allowing internal errors to escape during SPIR-V generation. - Add new diagnostic (ID 31225) for static const variables without initializers - Skip validation for extern static const variables - Skip validation for interface member variables - Add comprehensive test case covering various scenarios Fixes #7989 Co-authored-by: ArielG-NV * clean up test and implementation * format code (#7994) Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ArielG-NV Co-authored-by: slangbot Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --- source/slang/slang-check-decl.cpp | 31 ++++++++++++++++++++++ source/slang/slang-diagnostic-defs.h | 6 +++++ .../bugs/static-const-without-default-value.slang | 27 +++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 tests/bugs/static-const-without-default-value.slang diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp index 4ebad6392..02f404d88 100644 --- a/source/slang/slang-check-decl.cpp +++ b/source/slang/slang-check-decl.cpp @@ -2356,6 +2356,37 @@ void SemanticsDeclHeaderVisitor::checkVarDeclCommon(VarDeclBase* varDecl) // global variables and struct fields to prevent mangling. addModifier(varDecl, m_astBuilder->create()); } + + // Check for static const variables without initializers + if (!varDecl->initExpr) + { + bool isStatic = false; + bool isConst = false; + bool isExtern = false; + for (auto modifier : varDecl->modifiers) + { + if (as(modifier)) + isStatic = true; + else if (as(modifier)) + isConst = true; + else if (as(modifier)) + isExtern = true; + + if (isStatic && isConst && isExtern) + break; + } + if (isStatic && isConst && + // Don't error for extern variables + // Don't error for interface member variables + !isExtern && !as(varDecl->parentDecl)) + { + getSink()->diagnose( + varDecl, + Diagnostics::staticConstVariableRequiresInitializer, + varDecl); + } + } + checkVisibility(varDecl); } diff --git a/source/slang/slang-diagnostic-defs.h b/source/slang/slang-diagnostic-defs.h index 5544329a5..8f4845421 100644 --- a/source/slang/slang-diagnostic-defs.h +++ b/source/slang/slang-diagnostic-defs.h @@ -1510,6 +1510,12 @@ DIAGNOSTIC( constGlobalVarWithInitRequiresStatic, "global const variable with initializer must be declared static: '$0'") +DIAGNOSTIC( + 31225, + Error, + staticConstVariableRequiresInitializer, + "static const variable '$0' must have an initializer") + // Enums DIAGNOSTIC(32000, Error, invalidEnumTagType, "invalid tag type for 'enum': '$0'") diff --git a/tests/bugs/static-const-without-default-value.slang b/tests/bugs/static-const-without-default-value.slang new file mode 100644 index 000000000..b9d9055c9 --- /dev/null +++ b/tests/bugs/static-const-without-default-value.slang @@ -0,0 +1,27 @@ +// TEST:SIMPLE(filecheck=CHECK): -target spirv -stage compute -entry computeMain -emit-spirv-directly + +// Test cases for static const variables without initializers producing an error + +// CHECK: ([[# @LINE+1]]): error 31225 +static const int globalVar; + +// CHECK-NOT: error 31225 + +// This should NOT cause an error - extern static const +extern static const int externVar; + +interface ITest +{ + // This should NOT cause an error - interface member + static const int interfaceVar; +} + +// This should NOT cause an error - has initializer +static const int initializedVar = 42; +const int nonStaticVar; +static int nonConstVar; + +[numthreads(1,1,1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ +} -- cgit v1.2.3