Instead of depending on mutable inputs of upstream CppCompileAction instances,

CppCompileAction.discoverInputsStage2 retrieves values of discovered modules
from ActionExecutionValue.

This addresses a possible a correctness issue.

PiperOrigin-RevId: 202162180

1 files changed, 4 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
index a415e4859f..a42fc65807 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
@@ -79,6 +79,7 @@ import com.google.devtools.build.lib.events.Reporter;
 import com.google.devtools.build.lib.profiler.Profiler;
 import com.google.devtools.build.lib.profiler.ProfilerTask;
 import com.google.devtools.build.lib.profiler.SilentCloseable;
+import com.google.devtools.build.lib.rules.cpp.IncludeScannable;
 import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.build.lib.util.io.FileOutErr;
 import com.google.devtools.build.lib.util.io.OutErr;
@@ -773,6 +774,9 @@ public final class SkyframeActionExecutor {
             metadataHandler.getOutputTreeArtifactData(),
             metadataHandler.getAdditionalOutputData(),
             actionExecutionContext.getOutputSymlinks(),
+            (action instanceof IncludeScannable)
+                ? ((IncludeScannable) action).getDiscoveredModules()
+                : null,
             action instanceof NotifyOnActionCacheHit);
       }
     }