review: update diagnostics message

Author: inbelic

clang/include/clang/Basic/DiagnosticLexKinds.td

@@ -1020,10 +1020,9 @@ Error<"expected 'begin' or 'end'">;
 
 // HLSL Root Signature Lexing Errors
 let CategoryName = "Root Signature Lexical Issue" in {
-  def err_hlsl_invalid_number_literal:
-    Error<"expected number literal is not a supported number literal of unsigned integer or integer">;
+  def err_hlsl_expected_number_literal: Error<"expected numberic literal">;
   def err_hlsl_number_literal_overflow :
-    Error<"provided %select{unsigned integer|signed integer}0 literal '%1' that overflows the maximum of 32 bits">;
+    Error<"integer literal is too large to be represented in any %select{signed |}0 integer type">;
   def err_hlsl_invalid_token: Error<"unable to lex a valid Root Signature token">;
   def err_hlsl_invalid_register_literal: Error<"expected unsigned integer literal as part of register">;
 }

clang/lib/Parse/ParseHLSLRootSignature.cpp

@@ -20,10 +20,11 @@ bool RootSignatureLexer::LexNumber(RootSignatureToken &Result) {
   // Retrieve the possible number
   StringRef NumSpelling = Buffer.take_while(IsNumberChar);
 
-  // Catch this now as the Literal Parser will accept it as valid
+  // Catch when there is a '+' or '-' specified but no literal value after.
+  // This is invalid but the NumericLiteralParser will accept this as valid.
   if (NumSpelling.empty()) {
     PP.getDiagnostics().Report(Result.TokLoc,
-                               diag::err_hlsl_invalid_number_literal);
+                               diag::err_hlsl_expected_number_literal);
     return true;
   }
 
@@ -48,7 +49,7 @@ bool RootSignatureLexer::LexNumber(RootSignatureToken &Result) {
     // Report that the value has overflowed
     PP.getDiagnostics().Report(Result.TokLoc,
                                diag::err_hlsl_number_literal_overflow)
-        << (unsigned)Signed << NumSpelling;
+        << (unsigned)!Signed << NumSpelling;
     return true;
   }
 

clang/unittests/Parse/ParseHLSLRootSignatureTest.cpp

@@ -252,7 +252,7 @@ TEST_F(ParseHLSLRootSignatureTest, InvalidLexEmptyNumberTest) {
   auto TokLoc = SourceLocation();
 
   // Test correct diagnostic produced
-  Consumer->SetExpected(diag::err_hlsl_invalid_number_literal);
+  Consumer->SetExpected(diag::err_hlsl_expected_number_literal);
 
   hlsl::RootSignatureLexer Lexer(Source, TokLoc, *PP);