review: correctly exit the table scope before reporting more errors

Author: inbelic

clang/include/clang/Parse/ParseHLSLRootSignature.h

@@ -206,6 +206,13 @@ class RootSignatureParser {
   bool skipUntilExpectedToken(RootSignatureToken::Kind Expected);
   bool skipUntilExpectedToken(ArrayRef<RootSignatureToken::Kind> Expected);
 
+  /// Consume tokens until we reach a closing right paren, ')', or, until we
+  /// have reached the end of the stream. This will place the current token
+  /// to be the end of stream or the right paren.
+  ///
+  /// Returns true if it is closed before the end of stream.
+  bool skipUntilClosedParens(uint32_t NumParens = 1);
+
   /// Convert the token's offset in the signature string to its SourceLocation
   ///
   /// This allows to currently retrieve the location for multi-token

clang/lib/Parse/ParseHLSLRootSignature.cpp

@@ -62,7 +62,7 @@ bool RootSignatureParser::parse() {
         HadLocalError = true;
         // We are within a DescriptorTable, we will do our best to recover
         // by skipping until we encounter the expected closing ')'.
-        skipUntilExpectedToken(TokenKind::pu_r_paren);
+        skipUntilClosedParens();
         consumeNextToken();
       }
     } else if (tryConsumeExpectedToken(
@@ -1418,6 +1418,24 @@ bool RootSignatureParser::skipUntilExpectedToken(
   return true;
 }
 
+bool RootSignatureParser::skipUntilClosedParens(uint32_t NumParens) {
+  TokenKind ParenKinds[] = {
+      TokenKind::pu_l_paren,
+      TokenKind::pu_r_paren,
+  };
+  while (skipUntilExpectedToken(ParenKinds)) {
+    consumeNextToken();
+    if (CurToken.TokKind == TokenKind::pu_r_paren)
+      NumParens--;
+    else
+      NumParens++;
+    if (NumParens == 0)
+      return true;
+  }
+
+  return false;
+}
+
 SourceLocation RootSignatureParser::getTokenLocation(RootSignatureToken Tok) {
   return Signature->getLocationOfByte(Tok.LocOffset, PP.getSourceManager(),
                                       PP.getLangOpts(), PP.getTargetInfo());

clang/test/SemaHLSL/RootSignature-err.hlsl

@@ -141,3 +141,16 @@ void multiple_errors() {}
 // expected-error@+1 {{invalid parameter of SRV}}
 [RootSignature(DemoGranularityRootSignature)]
 void granularity_errors() {}
+
+#define TestTableScope \
+  "DescriptorTable( " \
+  "  UAV(u0, reported_diag), " \
+  "  SRV(t0, skipped_diag), " \
+  "  Sampler(s0, skipped_diag), " \
+  ")," \
+  "CBV(s0, reported_diag)"
+
+// expected-error@+2 {{invalid parameter of UAV}}
+// expected-error@+1 {{invalid parameter of CBV}}
+[RootSignature(TestTableScope)]
+void recover_scope_errors() {}