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

3 files changed, 5 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
index 21020148c0..734038cb29 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
@@ -435,6 +435,7 @@ public class ArtifactFunctionTest extends ArtifactFunctionTestCase {
           treeArtifactData,
           additionalOutputData,
           /*outputSymlinks=*/ null,
+          /*discoveredModules=*/ null,
           /*notifyOnActionCacheHitAction=*/ false);
     }
 
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
index 5b1305c7af..8ae221911e 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java
@@ -750,6 +750,7 @@ public class FilesystemValueCheckerTest {
         ImmutableMap.<Artifact, TreeArtifactValue>of(),
         ImmutableMap.<Artifact, FileArtifactValue>of(),
         /*outputSymlinks=*/ null,
+        /*discoveredModules=*/ null,
         /*notifyOnActionCacheHitAction=*/ false);
   }
 
@@ -762,6 +763,7 @@ public class FilesystemValueCheckerTest {
         ImmutableMap.of(emptyDir, emptyValue),
         ImmutableMap.<Artifact, FileArtifactValue>of(),
         /*outputSymlinks=*/ null,
+        /*discoveredModules=*/ null,
         /*notifyOnActionCacheHitAction=*/ false);
   }
 
@@ -796,6 +798,7 @@ public class FilesystemValueCheckerTest {
         treeArtifactData,
         ImmutableMap.<Artifact, FileArtifactValue>of(),
         /*outputSymlinks=*/ null,
+        /*discoveredModules=*/ null,
         /*notifyOnActionCacheHitAction=*/ false);
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
index a5c74c5a96..0f5d21bca7 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java
@@ -277,6 +277,7 @@ public class TreeArtifactMetadataTest extends ArtifactFunctionTestCase {
           ImmutableMap.of(output, treeArtifactValue),
           ImmutableMap.<Artifact, FileArtifactValue>of(),
           /*outputSymlinks=*/ null,
+          /*discoveredModules=*/ null,
           /*notifyOnActionCacheHitAction=*/ false);
     }