diff options
3 files changed, 0 insertions, 22 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 38fb99a283..e183366c11 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 @@ -201,28 +201,10 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver state.inputArtifactData = checkedInputs.first; state.expandedArtifacts = checkedInputs.second; if (skyframeActionExecutor.usesActionFileSystem()) { - Iterable<Artifact> optionalInputs; - if (action.discoversInputs()) { - if (action instanceof IncludeScannable) { - // This is a performance optimization to minimize nested set traversals for cpp - // compilation. CppCompileAction.getAllowedDerivedInputs iterates over mandatory inputs, - // prunable inputs, declared include srcs, transitive compilation prerequisites and - // transitive modules. - // - // The only one of those sets known to be needed is the declared include srcs. - optionalInputs = ((IncludeScannable) action).getDeclaredIncludeSrcs(); - } else { - // This might be reachable by LtoBackendAction and ExtraAction. - optionalInputs = action.getAllowedDerivedInputs(); - } - } else { - optionalInputs = ImmutableList.of(); - } state.actionFileSystem = skyframeActionExecutor.createActionFileSystem( directories.getRelativeOutputPath(), checkedInputs.first, - optionalInputs, action.getOutputs()); } } 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 49b864e563..5f9ceb9da6 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 @@ -377,7 +377,6 @@ public final class SkyframeActionExecutor { FileSystem createActionFileSystem( String relativeOutputPath, ActionInputMap inputArtifactData, - Iterable<Artifact> allowedInputs, Iterable<Artifact> outputArtifacts) { return outputService.createActionFileSystem( executorEngine.getFileSystem(), @@ -385,7 +384,6 @@ public final class SkyframeActionExecutor { relativeOutputPath, sourceRootSupplier.get(), inputArtifactData, - allowedInputs, outputArtifacts); } diff --git a/src/main/java/com/google/devtools/build/lib/vfs/OutputService.java b/src/main/java/com/google/devtools/build/lib/vfs/OutputService.java index 55cadc77c0..9afa82fb53 100644 --- a/src/main/java/com/google/devtools/build/lib/vfs/OutputService.java +++ b/src/main/java/com/google/devtools/build/lib/vfs/OutputService.java @@ -115,7 +115,6 @@ public interface OutputService { * @param sourceRoots list of directories on the package path (from {@link * com.google.devtools.build.lib.pkgcache.PathPackageLocator}) * @param inputArtifactData information about required inputs to the action - * @param allowedInputs optional inputs that might be added during input discovery * @param outputArtifacts required outputs of the action * @return an action-scoped filesystem if {@link supportsActionFileSystem} is true */ @@ -126,7 +125,6 @@ public interface OutputService { String relativeOutputPath, ImmutableList<Root> sourceRoots, ActionInputMap inputArtifactData, - Iterable<Artifact> allowedInputs, Iterable<Artifact> outputArtifacts) { return null; } |