rebase onto parser review changes

Author: inbelic

clang/lib/Sema/SemaHLSL.cpp

@@ -659,13 +659,9 @@ void SemaHLSL::handleRootSignatureAttr(Decl *D, const ParsedAttr &AL) {
   SourceLocation Loc = AL.getArgAsExpr(0)->getExprLoc();
   // FIXME: pass down below to lexer when fp is supported
   // llvm::RoundingMode RM = SemaRef.CurFPFeatures.getRoundingMode();
-  SmallVector<hlsl::RootSignatureToken> Tokens;
   hlsl::RootSignatureLexer Lexer(Signature, Loc, SemaRef.getPreprocessor());
-  if (Lexer.Lex(Tokens))
-    return;
-
   SmallVector<llvm::hlsl::rootsig::RootElement> Elements;
-  hlsl::RootSignatureParser Parser(Elements, Tokens,
+  hlsl::RootSignatureParser Parser(Elements, Lexer,
                                    SemaRef.getPreprocessor().getDiagnostics());
   if (Parser.Parse())
     return;

clang/test/SemaHLSL/RootSignature-err.hlsl

@@ -10,39 +10,42 @@
   "  invalid " \
   ")"
 
-[RootSignature(InvalidToken)] // expected-error {{unable to lex a valid Root Signature token}}
+[RootSignature(InvalidToken)] // expected-error {{expected one of the following token kinds: CBV, SRV, UAV, Sampler}}
 void bad_root_signature_1() {}
 
 #define InvalidEmptyNumber \
   "DescriptorTable( " \
   "  CBV(t32, space = +) " \
   ")"
 
-[RootSignature(InvalidEmptyNumber)] // expected-error {{expected number literal is not a supported number literal of unsigned integer or integer}}
+// expected-error@+1 {{expected the following token kind: integer literal}}
+[RootSignature(InvalidEmptyNumber)]
 void bad_root_signature_2() {}
 
 #define InvalidOverflowNumber \
   "DescriptorTable( " \
   "  CBV(t32, space = 98273498327498273487) " \
   ")"
 
-[RootSignature(InvalidOverflowNumber)] // expected-error {{provided unsigned integer literal '98273498327498273487' that overflows the maximum of 32 bits}}
+// expected-error@+1 {{integer literal '98273498327498273487' is too large to be represented in a 32-bit integer type}}
+[RootSignature(InvalidOverflowNumber)]
 void bad_root_signature_3() {}
 
-#define InvalidEOS \
-  "DescriptorTable( "
-
 // Parser related tests
 
-[RootSignature(InvalidEOS)] // expected-error {{unexpected end to token stream}}
+#define InvalidEOS \
+  "DescriptorTable( " \
+  "  CBV("
+
+[RootSignature(InvalidEOS)] // expected-error {{expected one of the following token kinds: b register, t register, u register, s register}}
 void bad_root_signature_4() {}
 
 #define InvalidTokenKind \
   "DescriptorTable( " \
-  "  DescriptorTable()" \
+  "  SRV(s0, CBV())" \
   ")"
 
-[RootSignature(InvalidTokenKind)] // expected-error {{expected the one of the following token kinds 'CBV, SRV, UAV, Sampler'}}
+[RootSignature(InvalidTokenKind)] // expected-error {{expected one of the following token kinds: offset, numDescriptors, space, flags}}
 void bad_root_signature_5() {}
 
 #define InvalidRepeat \