Remove -fretain-subst-template-type-parm-type-ast-nodes from nullability code.

llvm/llvm-project#132748 makes this flag a no-op

PiperOrigin-RevId: 747946560
Change-Id: Id2c92df6b2eb2c62dcdf8bb59e96b8e3cb118723

Author: Googler

nullability/inference/augmented_test_inputs.cc

@@ -29,10 +29,7 @@ TestInputs getAugmentedTestInputs(llvm::StringRef Source,
   for (const auto& Entry : llvm::ArrayRef(ctn_replacement_macros_create(),
                                           ctn_replacement_macros_size()))
     Inputs.ExtraFiles.try_emplace(Entry.name, Entry.data);
-  // TODO: b/357760487 -- use the flag until the issue is resolved or we find a
-  // workaround.
-  Inputs.ExtraArgs.push_back(
-      "-fretain-subst-template-type-parm-type-ast-nodes");
+
   Inputs.ExtraArgs.push_back("-I.");
   Inputs.ExtraArgs.push_back("-include");
   Inputs.ExtraArgs.push_back("nullability_annotations.h");

nullability/inference/infer_tu_main.cc

@@ -319,10 +319,7 @@ int main(int argc, const char **absl_nonnull argv) {
            "-w",
            // Include the file containing macro replacements that enable
            // additional inference.
-           "-include", std::string(ReplacementMacrosHeaderFileName),
-           // TODO: b/357760487 -- use the flag until the issue is resolved or
-           // we find a workaround.
-           "-Xclang", "-fretain-subst-template-type-parm-type-ast-nodes"},
+           "-include", std::string(ReplacementMacrosHeaderFileName)},
           ArgumentInsertPosition::BEGIN));
   QCHECK(!Err) << toString(std::move(Err));
 }

nullability/test/nullability_test.cc

@@ -647,14 +647,10 @@ int main(int argc, const char **argv) {
   // Run in C++17 and C++20 mode to cover differences in the AST between modes
   // (e.g. C++20 can contain `CXXRewrittenBinaryOperator`).
   for (const char *CxxMode : {"-std=c++17", "-std=c++20"})
-    require(Executor.execute(
-        clang::tooling::newFrontendActionFactory(&F, &F),
-        clang::tooling::getInsertArgumentAdjuster(
-            // Ensure test_headers are on the include path.
-            {"-isystem.", CxxMode,
-             // TODO: b/357760487 -- use the flag until the issue is resolved or
-             // we find a workaround.
-             "-Xclang", "-fretain-subst-template-type-parm-type-ast-nodes"},
-            clang::tooling::ArgumentInsertPosition::END)));
+    require(Executor.execute(clang::tooling::newFrontendActionFactory(&F, &F),
+                             clang::tooling::getInsertArgumentAdjuster(
+                                 // Ensure test_headers are on the include path.
+                                 {"-isystem.", CxxMode},
+                                 clang::tooling::ArgumentInsertPosition::END)));
   return F.Output.hadErrors() ? 1 : 0;
 }

nullability/type_nullability_test.cc

@@ -418,10 +418,6 @@ class GetTypeNullabilityTest : public ::testing::Test {
     Inputs.ExtraArgs.push_back("nullability.h");
     Inputs.ExtraArgs.push_back("-include");
     Inputs.ExtraArgs.push_back("header.h");
-    // TODO: b/357760487 -- use the flag until the issue is resolved or we find
-    // a workaround.
-    Inputs.ExtraArgs.push_back(
-        "-fretain-subst-template-type-parm-type-ast-nodes");
     Inputs.ExtraFiles["nullability.h"] = R"cpp(
       template <class X>
       using Nullable [[clang::annotate("Nullable")]] = X _Nullable;
@@ -793,10 +789,6 @@ std::vector<ComparableNullabilityLoc> getComparableNullabilityLocs(
   TestInputs Inputs(AnnotatedInput.code());
   Inputs.MakeAction = makeRegisterPragmasAction(Pragmas);
   Inputs.Language = TestLanguage::Lang_CXX17;
-  // TODO: b/357760487 -- use the flag until the issue is resolved or we find a
-  // workaround.
-  Inputs.ExtraArgs.push_back(
-      "-fretain-subst-template-type-parm-type-ast-nodes");
   if (!HeaderWithAttributes.empty()) {
     Inputs.ExtraFiles["header.h"] = HeaderWithAttributes;
     Inputs.ExtraArgs.push_back("-include");