add extra default visibility testcase

- also catches a small error for no clauses edge case
llvm · Jan 14, 2025 · ab390a2 · ab390a2
1 parent d5b19cb
commit ab390a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/clang/lib/Parse/ParseHLSLRootSignature.cpp b/clang/lib/Parse/ParseHLSLRootSignature.cpp
@@ -218,7 +218,7 @@ bool RootSignatureParser::ParseDescriptorTable() {
     HasComma = !TryConsumeExpectedToken(TokenKind::pu_comma);
   }
 
-  if (HasComma)
+  if (HasComma && Table.NumClauses != 0)
     return ReportError(); // report 'comma' denotes a required extra item
 
   if (ConsumeExpectedToken(TokenKind::pu_r_paren))

diff --git a/clang/unittests/Parse/ParseHLSLRootSignatureTest.cpp b/clang/unittests/Parse/ParseHLSLRootSignatureTest.cpp
@@ -139,7 +139,8 @@ TEST_F(ParseHLSLRootSignatureTest, ParseValidDTClausesTest) {
               | Descriptors_Static_Keeping_Buffer_Bounds_Checks
       ),
       visibility = Shader_Visibility_Pixel
-    )
+    ),
+    DescriptorTable()
   )cc";
 
   TrivialModuleLoader ModLoader;
@@ -155,7 +156,7 @@ TEST_F(ParseHLSLRootSignatureTest, ParseValidDTClausesTest) {
   RootSignatureParser Parser(Elements, Tokens);
 
   ASSERT_FALSE(Parser.Parse());
-  ASSERT_EQ((int)Elements.size(), 5);
+  ASSERT_EQ((int)Elements.size(), 6);
 
   // Test default values are set correctly
   RootElement Elem = Elements[0];
@@ -209,6 +210,12 @@ TEST_F(ParseHLSLRootSignatureTest, ParseValidDTClausesTest) {
   ASSERT_EQ(Elem.Table.NumClauses, (uint32_t)4);
   ASSERT_EQ(Elem.Table.Visibility, ShaderVisibility::Pixel);
 
+  // Test generated DescriptorTable start has correct default values
+  Elem = Elements[5];
+  ASSERT_EQ(Elem.Tag, RootElement::ElementType::DescriptorTable);
+  ASSERT_EQ(Elem.Table.NumClauses, (uint32_t)0);
+  ASSERT_EQ(Elem.Table.Visibility, ShaderVisibility::All);
+
   delete PP;
 }