self-review: rename ComparisonFunc members to avoid name abiguitity

Author: inbelic

clang/include/clang/Parse/ParseHLSLRootSignature.h

@@ -116,7 +116,7 @@ class RootSignatureParser {
     std::optional<llvm::hlsl::rootsig::TextureAddressMode> AddressV;
     std::optional<llvm::hlsl::rootsig::TextureAddressMode> AddressW;
     std::optional<uint32_t> MaxAnisotropy;
-    std::optional<llvm::hlsl::rootsig::ComparisonFunc> ComparisonFunc;
+    std::optional<llvm::hlsl::rootsig::ComparisonFunc> CompFunc;
     std::optional<llvm::hlsl::rootsig::StaticBorderColor> BorderColor;
     std::optional<float> MinLOD;
     std::optional<float> MaxLOD;

clang/lib/Parse/ParseHLSLRootSignature.cpp

@@ -392,8 +392,8 @@ std::optional<StaticSampler> RootSignatureParser::parseStaticSampler() {
   if (Params->MaxAnisotropy.has_value())
     Sampler.MaxAnisotropy = Params->MaxAnisotropy.value();
 
-  if (Params->ComparisonFunc.has_value())
-    Sampler.ComparisonFunc = Params->ComparisonFunc.value();
+  if (Params->CompFunc.has_value())
+    Sampler.CompFunc = Params->CompFunc.value();
 
   if (Params->BorderColor.has_value())
     Sampler.BorderColor = Params->BorderColor.value();
@@ -777,7 +777,7 @@ RootSignatureParser::parseStaticSamplerParams() {
 
     // `comparisonFunc` `=` COMPARISON_FUNC
     if (tryConsumeExpectedToken(TokenKind::kw_comparisonFunc)) {
-      if (Params.ComparisonFunc.has_value()) {
+      if (Params.CompFunc.has_value()) {
         getDiags().Report(CurToken.TokLoc, diag::err_hlsl_rootsig_repeat_param)
             << CurToken.TokKind;
         return std::nullopt;
@@ -786,10 +786,10 @@ RootSignatureParser::parseStaticSamplerParams() {
       if (consumeExpectedToken(TokenKind::pu_equal))
         return std::nullopt;
 
-      auto ComparisonFunc = parseComparisonFunc();
-      if (!ComparisonFunc.has_value())
+      auto CompFunc = parseComparisonFunc();
+      if (!CompFunc.has_value())
         return std::nullopt;
-      Params.ComparisonFunc = ComparisonFunc;
+      Params.CompFunc = CompFunc;
     }
 
     // `borderColor` `=` STATIC_BORDER_COLOR

clang/unittests/Parse/ParseHLSLRootSignatureTest.cpp

@@ -261,7 +261,7 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseStaticSamplerTest) {
   ASSERT_EQ(std::get<StaticSampler>(Elem).AddressW, TextureAddressMode::Wrap);
   ASSERT_FLOAT_EQ(std::get<StaticSampler>(Elem).MipLODBias, 0.f);
   ASSERT_EQ(std::get<StaticSampler>(Elem).MaxAnisotropy, 16u);
-  ASSERT_EQ(std::get<StaticSampler>(Elem).ComparisonFunc,
+  ASSERT_EQ(std::get<StaticSampler>(Elem).CompFunc,
             ComparisonFunc::LessEqual);
   ASSERT_EQ(std::get<StaticSampler>(Elem).BorderColor,
             StaticBorderColor::OpaqueWhite);
@@ -278,7 +278,7 @@ TEST_F(ParseHLSLRootSignatureTest, ValidParseStaticSamplerTest) {
   ASSERT_EQ(std::get<StaticSampler>(Elem).AddressW, TextureAddressMode::Clamp);
   ASSERT_FLOAT_EQ(std::get<StaticSampler>(Elem).MipLODBias, 230.f);
   ASSERT_EQ(std::get<StaticSampler>(Elem).MaxAnisotropy, 3u);
-  ASSERT_EQ(std::get<StaticSampler>(Elem).ComparisonFunc,
+  ASSERT_EQ(std::get<StaticSampler>(Elem).CompFunc,
             ComparisonFunc::NotEqual);
   ASSERT_EQ(std::get<StaticSampler>(Elem).BorderColor,
             StaticBorderColor::OpaqueBlackUint);

llvm/include/llvm/Frontend/HLSL/HLSLRootSignature.h

@@ -189,7 +189,7 @@ struct StaticSampler {
   TextureAddressMode AddressW = TextureAddressMode::Wrap;
   float MipLODBias = 0.f;
   uint32_t MaxAnisotropy = 16;
-  ComparisonFunc ComparisonFunc = ComparisonFunc::LessEqual;
+  ComparisonFunc CompFunc = ComparisonFunc::LessEqual;
   StaticBorderColor BorderColor = StaticBorderColor::OpaqueWhite;
   float MinLOD = 0.f;
   float MaxLOD = std::numeric_limits<float>::max();