nfc: prepare to extend diagnostic to values as well

Author: inbelic

clang/include/clang/Basic/DiagnosticParseKinds.td

@@ -1860,7 +1860,7 @@ def err_hlsl_virtual_inheritance
     : Error<"virtual inheritance is unsupported in HLSL">;
 
 // HLSL Root Signature Parser Diagnostics
-def err_hlsl_invalid_param : Error<"invalid parameter of %0">;
+def err_hlsl_invalid_token : Error<"invalid %select{parameter|value}0 of %1">;
 def err_hlsl_rootsig_repeat_param : Error<"specified the same parameter '%0' multiple times">;
 def err_hlsl_rootsig_missing_param : Error<"did not specify mandatory parameter '%0'">;
 def err_hlsl_number_literal_overflow : Error<

clang/lib/Parse/ParseHLSLRootSignature.cpp

@@ -61,8 +61,8 @@ bool RootSignatureParser::parse() {
       Elements.emplace_back(RootSignatureElement(ElementLoc, *Sampler));
     } else {
       consumeNextToken(); // let diagnostic be at the start of invalid token
-      reportDiag(diag::err_hlsl_invalid_param)
-          << /*param of*/ TokenKind::kw_RootSignature;
+      reportDiag(diag::err_hlsl_invalid_token)
+          << /*parameter=*/0 << /*param of*/ TokenKind::kw_RootSignature;
       return true;
     }
 
@@ -268,8 +268,8 @@ std::optional<DescriptorTable> RootSignatureParser::parseDescriptorTable() {
         return std::nullopt;
     } else {
       consumeNextToken(); // let diagnostic be at the start of invalid token
-      reportDiag(diag::err_hlsl_invalid_param)
-          << /*param of*/ TokenKind::kw_DescriptorTable;
+      reportDiag(diag::err_hlsl_invalid_token)
+          << /*parameter=*/0 << /*param of*/ TokenKind::kw_DescriptorTable;
       return std::nullopt;
     }
 
@@ -486,8 +486,8 @@ RootSignatureParser::parseRootConstantParams() {
       Params.Visibility = Visibility;
     } else {
       consumeNextToken(); // let diagnostic be at the start of invalid token
-      reportDiag(diag::err_hlsl_invalid_param)
-          << /*param of*/ TokenKind::kw_RootConstants;
+      reportDiag(diag::err_hlsl_invalid_token)
+          << /*parameter=*/0 << /*param of*/ TokenKind::kw_RootConstants;
       return std::nullopt;
     }
 
@@ -561,7 +561,8 @@ RootSignatureParser::parseRootDescriptorParams(TokenKind DescKind,
       Params.Flags = Flags;
     } else {
       consumeNextToken(); // let diagnostic be at the start of invalid token
-      reportDiag(diag::err_hlsl_invalid_param) << /*param of*/ DescKind;
+      reportDiag(diag::err_hlsl_invalid_token)
+          << /*parameter=*/0 << /*param of*/ DescKind;
       return std::nullopt;
     }
 
@@ -661,7 +662,8 @@ RootSignatureParser::parseDescriptorTableClauseParams(TokenKind ClauseKind,
       Params.Flags = Flags;
     } else {
       consumeNextToken(); // let diagnostic be at the start of invalid token
-      reportDiag(diag::err_hlsl_invalid_param) << /*param of*/ ClauseKind;
+      reportDiag(diag::err_hlsl_invalid_token)
+          << /*parameter=*/0 << /*param of*/ ClauseKind;
       return std::nullopt;
     }
 
@@ -860,8 +862,8 @@ RootSignatureParser::parseStaticSamplerParams() {
       Params.Visibility = Visibility;
     } else {
       consumeNextToken(); // let diagnostic be at the start of invalid token
-      reportDiag(diag::err_hlsl_invalid_param)
-          << /*param of*/ TokenKind::kw_StaticSampler;
+      reportDiag(diag::err_hlsl_invalid_token)
+          << /*parameter=*/0 << /*param of*/ TokenKind::kw_StaticSampler;
       return std::nullopt;
     }
 

clang/unittests/Parse/ParseHLSLRootSignatureTest.cpp

@@ -865,7 +865,7 @@ TEST_F(ParseHLSLRootSignatureTest, InvalidParseInvalidTokenTest) {
                                    Signature, *PP);
 
   // Test correct diagnostic produced - invalid token
-  Consumer->setExpected(diag::err_hlsl_invalid_param);
+  Consumer->setExpected(diag::err_hlsl_invalid_token);
   ASSERT_TRUE(Parser.parse());
 
   ASSERT_TRUE(Consumer->isSatisfied());