Enable C++ deps pruning on Windows when PARSE_SHOWINCLUDES is availab…

…le. (#17957) This fixes #14947. Closes #17928. PiperOrigin-RevId: 521446074 Change-Id: I4bc155f0245bc1933e86cd0b37762263437ed1fe Co-authored-by: Konstantin Erman <[email protected]>
bazelbuild · Apr 4, 2023 · d3b59ad · d3b59ad
1 parent 2c1a63b
commit d3b59ad
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java
@@ -337,6 +337,10 @@ private ImmutableList<Artifact> getBuiltinIncludeFiles() {
     return result.build();
   }
 
+  private boolean shouldParseShowIncludes() {
+    return featureConfiguration.isEnabled(CppRuleClasses.PARSE_SHOWINCLUDES);
+  }
+
   /**
    * Returns the list of mandatory inputs for the {@link CppCompileAction} as configured.
    */
@@ -352,7 +356,7 @@ NestedSet<Artifact> buildMandatoryInputs() {
     if (grepIncludes != null) {
       realMandatoryInputsBuilder.add(grepIncludes);
     }
-    if (!shouldScanIncludes && dotdFile == null) {
+    if (!shouldScanIncludes && dotdFile == null && !shouldParseShowIncludes()) {
       realMandatoryInputsBuilder.addTransitive(ccCompilationContext.getDeclaredIncludeSrcs());
       realMandatoryInputsBuilder.addTransitive(additionalPrunableHeaders);
     }
@@ -473,8 +477,7 @@ public boolean useDotdFile(Artifact sourceFile) {
   }
 
   public boolean dotdFilesEnabled() {
-    return cppSemantics.needsDotdInputPruning(configuration)
-        && !featureConfiguration.isEnabled(CppRuleClasses.PARSE_SHOWINCLUDES);
+    return cppSemantics.needsDotdInputPruning(configuration) && !shouldParseShowIncludes();
   }
 
   public boolean serializedDiagnosticsFilesEnabled() {