Automated rollback of commit 39974a43abdd32e3a1acbc7da945b08da9983e4e.

*** Reason for rollback ***

b/112458627

*** Original change description ***

Allow skyframe-aware actions to pass partial results through ActionExecutionContext.
Remove FilesetProvider.

PiperOrigin-RevId: 208213955

1 files changed, 6 insertions, 11 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 0905cf1bef..7bff8b0193 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
@@ -187,9 +187,8 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver
       return null;
     }
 
-    Object skyframeDepsResult;
     try {
-      skyframeDepsResult = establishSkyframeDependencies(env, action);
+      establishSkyframeDependencies(env, action);
     } catch (ActionExecutionException e) {
       throw new ActionExecutionFunctionException(e);
     }
@@ -214,8 +213,7 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver
     try {
       result =
           checkCacheAndExecuteIfNeeded(
-              action, state, env, clientEnv, actionLookupData, sharedActionAlreadyRan,
-              skyframeDepsResult);
+              action, state, env, clientEnv, actionLookupData, sharedActionAlreadyRan);
     } catch (ActionExecutionException e) {
       // Remove action from state map in case it's there (won't be unless it discovers inputs).
       stateMap.remove(action);
@@ -365,8 +363,7 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver
       Environment env,
       Map<String, String> clientEnv,
       ActionLookupData actionLookupData,
-      boolean sharedActionAlreadyRan,
-      Object skyframeDepsResult)
+      boolean sharedActionAlreadyRan)
       throws ActionExecutionException, InterruptedException {
     // If this is a shared action and the other action is the one that executed, we must use that
     // other action's value, provided here, since it is populated with metadata for the outputs.
@@ -499,8 +496,7 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver
             metadataHandler,
             Collections.unmodifiableMap(state.expandedArtifacts),
             filesets,
-            state.actionFileSystem,
-            skyframeDepsResult)) {
+            state.actionFileSystem)) {
       if (!state.hasExecutedAction()) {
         state.value =
             skyframeActionExecutor.executeAction(
@@ -601,7 +597,7 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver
     }
   }
 
-  private static Object establishSkyframeDependencies(Environment env, Action action)
+  private static void establishSkyframeDependencies(Environment env, Action action)
       throws ActionExecutionException, InterruptedException {
     // Before we may safely establish Skyframe dependencies, we must build all action inputs by
     // requesting their ArtifactValues.
@@ -618,12 +614,11 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver
       Preconditions.checkState(action.executeUnconditionally(), action);
 
       try {
-        return ((SkyframeAwareAction) action).establishSkyframeDependencies(env);
+        ((SkyframeAwareAction) action).establishSkyframeDependencies(env);
       } catch (SkyframeAwareAction.ExceptionBase e) {
         throw new ActionExecutionException(e, action, false);
       }
     }
-    return null;
   }
 
   private static Iterable<SkyKey> toKeys(