Return the set of files found when discovering inputs. Skyframe will probably want to store these and may declare dependencies in advance so all metadata is present in the graph.

Long-term, we may be able to use the returned set to make input-discovering actions immutable, which would be nice.

--
MOS_MIGRATED_REVID=88348068

1 files changed, 3 insertions, 3 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 c89631526f..ebae390f50 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
@@ -586,12 +586,12 @@ public final class SkyframeActionExecutor {
    * <p>This method is just a wrapper around {@link Action#discoverInputs} that properly processes
    * any ActionExecutionException thrown before rethrowing it to the caller.
    */
-  void discoverInputs(Action action, ActionExecutionContext actionExecutionContext)
+  Collection<Artifact> discoverInputs(Action action, ActionExecutionContext actionExecutionContext)
       throws ActionExecutionException, InterruptedException {
     try {
-      action.discoverInputs(actionExecutionContext);
+      return action.discoverInputs(actionExecutionContext);
     } catch (ActionExecutionException e) {
-      processAndThrow(e, action, actionExecutionContext.getFileOutErr());
+      throw processAndThrow(e, action, actionExecutionContext.getFileOutErr());
     }
   }