Allow enum cases to be used in attribute arguments. (shader-slang#5478)

jkwak-work · Nov 3, 2024 · 5f4980a · 5f4980a
1 parent f4d5aa7
commit 5f4980a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp
@@ -6602,6 +6602,7 @@ bool SemanticsVisitor::checkInterfaceConformance(
     {
         if (!isAssociatedTypeDecl(requiredMemberDecl.getDecl()))
             continue;
+        ensureDecl(requiredMemberDecl, DeclCheckState::ReadyForReference);
         auto requiredMemberDeclRef = m_astBuilder->getLookupDeclRef(
             subTypeConformsToSuperInterfaceWitness,
             requiredMemberDecl.getDecl());
@@ -6623,6 +6624,7 @@ bool SemanticsVisitor::checkInterfaceConformance(
             continue;
         if (requiredMemberDecl.as<DerivativeRequirementDecl>())
             continue;
+        ensureDecl(requiredMemberDecl, DeclCheckState::ReadyForReference);
         auto requiredMemberDeclRef = m_astBuilder->getLookupDeclRef(
             subTypeConformsToSuperInterfaceWitness,
             requiredMemberDecl.getDecl());

diff --git a/source/slang/slang-check-expr.cpp b/source/slang/slang-check-expr.cpp
@@ -2038,6 +2038,12 @@ IntVal* SemanticsVisitor::tryConstantFoldExpr(
         }
         else if (auto enumRef = declRef.as<EnumCaseDecl>())
         {
+            auto enumTypeDecl = enumRef.getParent().getDecl();
+            if (enumTypeDecl && !enumTypeDecl->checkState.isBeingChecked())
+            {
+                ensureDecl(enumRef.getParent(), DeclCheckState::DefinitionChecked);
+            }
+
             // The cases in an `enum` declaration can also be used as constant expressions,
             if (auto tagExpr = getTagExpr(m_astBuilder, enumRef))
             {

diff --git a/tests/language-feature/enums/enum-in-binding.slang b/tests/language-feature/enums/enum-in-binding.slang
@@ -0,0 +1,18 @@
+//TEST:SIMPLE(filecheck=CHECK): -target spirv
+
+// CHECK: OpDecorate %g_buffer Binding 2
+
+enum class E {
+    A,
+    B,
+    C
+}
+
+[vk::binding(E.C)]
+RWStructuredBuffer<float> g_buffer;
+
+[numthreads(1,1,1)]
+void main()
+{
+    g_buffer[0] = 1.0f;
+}