1 files changed, 6 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
index a615cf76cd..1be61e1f77 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
@@ -151,12 +151,14 @@ final class WorkerSpawnRunner implements SpawnRunner {
             spawn.getMnemonic(),
             workerFilesCombinedHash,
             workerFiles,
+            inputFiles,
+            outputFiles,
             policy.speculating());
 
     WorkRequest workRequest = createWorkRequest(spawn, policy, flagFiles, inputFileCache);
 
     long startTime = System.currentTimeMillis();
-    WorkResponse response = execInWorker(key, workRequest, policy, inputFiles, outputFiles);
+    WorkResponse response = execInWorker(key, workRequest, policy);
     Duration wallTime = Duration.ofMillis(System.currentTimeMillis() - startTime);
 
     FileOutErr outErr = policy.getFileOutErr();
@@ -255,12 +257,7 @@ final class WorkerSpawnRunner implements SpawnRunner {
     }
   }
 
-  private WorkResponse execInWorker(
-      WorkerKey key,
-      WorkRequest request,
-      SpawnExecutionPolicy policy,
-      Map<PathFragment, Path> inputFiles,
-      Set<PathFragment> outputFiles)
+  private WorkResponse execInWorker(WorkerKey key, WorkRequest request, SpawnExecutionPolicy policy)
       throws InterruptedException, ExecException {
     Worker worker = null;
     WorkResponse response;
@@ -278,7 +275,7 @@ final class WorkerSpawnRunner implements SpawnRunner {
       }
 
       try {
-        worker.prepareExecution(inputFiles, outputFiles, key.getWorkerFilesWithHashes().keySet());
+        worker.prepareExecution(key);
       } catch (IOException e) {
         throw new UserExecException(
             ErrorMessage.builder()
@@ -340,7 +337,7 @@ final class WorkerSpawnRunner implements SpawnRunner {
       }
 
       try {
-        worker.finishExecution(execRoot);
+        worker.finishExecution(key);
       } catch (IOException e) {
         throw new UserExecException(
             ErrorMessage.builder()