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, 6 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
index ae34b1b945..611e3f2059 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
@@ -413,6 +413,9 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver
           metadataHandler.getOutputTreeArtifactData(),
           metadataHandler.getAdditionalOutputData(),
           /*outputSymlinks=*/ null,
+          (action instanceof IncludeScannable)
+              ? ((IncludeScannable) action).getDiscoveredModules()
+              : null,
           action instanceof NotifyOnActionCacheHit);
     }
 
@@ -454,6 +457,9 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver
       // available.
       if (state.discoveredInputsStage2 == null) {
         state.discoveredInputsStage2 = action.discoverInputsStage2(env);
+        if (env.valuesMissing()) {
+          return null;
+        }
       }
       if (state.discoveredInputsStage2 != null) {
         addDiscoveredInputs(