aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar janakr <janakr@google.com>2017-09-22 16:55:31 -0400
committerGravatar John Cater <jcater@google.com>2017-09-25 09:38:48 -0400
commit92e402ba666f127204596c7c66c4b0022650e370 (patch)
tree4a4a3c4218a282ed86e6826d748ac22043cbf2d3 /src
parentc6ff86fa17b8372bad1311601ef3db96a74b968e (diff)
Remove unused "extraPrecomputedValues" from WorkspaceBuilder, and therefore remove all "precomputed values for analysis" from SkyframeExecutor. We use SkyframeExecutor#injectExtraPrecomputedValues these days.
This simplifies logic around when to inject precomputed values, and makes the graph more consistent. PiperOrigin-RevId: 169733304
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/runtime/WorkspaceBuilder.java26
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java2
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java4
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorFactory.java2
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java13
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutorFactory.java2
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java1
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java1
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java1
-rw-r--r--src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java2
-rw-r--r--src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java2
-rw-r--r--src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java2
-rw-r--r--src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java2
-rw-r--r--src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java2
14 files changed, 1 insertions, 61 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/WorkspaceBuilder.java b/src/main/java/com/google/devtools/build/lib/runtime/WorkspaceBuilder.java
index f7079bf81f..536a7585aa 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/WorkspaceBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/WorkspaceBuilder.java
@@ -24,8 +24,6 @@ import com.google.devtools.build.lib.analysis.WorkspaceStatusAction;
import com.google.devtools.build.lib.analysis.config.BinTools;
import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.skyframe.DiffAwareness;
-import com.google.devtools.build.lib.skyframe.PrecomputedValue;
-import com.google.devtools.build.lib.skyframe.PrecomputedValue.Injected;
import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutorFactory;
import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
@@ -54,8 +52,6 @@ public final class WorkspaceBuilder {
// is inserted.
private final ImmutableMap.Builder<SkyFunctionName, SkyFunction> skyFunctions =
ImmutableMap.builder();
- private final ImmutableList.Builder<PrecomputedValue.Injected> precomputedValues =
- ImmutableList.builder();
private final ImmutableList.Builder<SkyValueDirtinessChecker> customDirtinessCheckers =
ImmutableList.builder();
@@ -87,7 +83,6 @@ public final class WorkspaceBuilder {
diffAwarenessFactories.build(),
allowedMissingInputs,
skyFunctions.build(),
- precomputedValues.build(),
customDirtinessCheckers.build());
return new BlazeWorkspace(
runtime, directories, skyframeExecutor, eventBusExceptionHandler,
@@ -157,27 +152,6 @@ public final class WorkspaceBuilder {
return this;
}
- /**
- * Adds an extra precomputed value to Skyframe.
- *
- * <p>This functionality can be used to implement precomputed values that are not constant during
- * the lifetime of a Blaze instance (naturally, they must be constant over the course of a build).
- *
- * <p>The following things must be done in order to define a new precomputed values:
- * <ul>
- * <li> Create a public static final variable of type
- * {@link com.google.devtools.build.lib.skyframe.PrecomputedValue.Precomputed}.
- * <li> Set its value by adding an {@link Injected} via this method (it can be created using the
- * aforementioned variable and the value or a supplier of the value).
- * <li> Reference the value in Skyframe functions by calling the {@code get} method on the
- * {@link com.google.devtools.build.lib.skyframe.PrecomputedValue.Precomputed} variable.
- * </ul>
- */
- public WorkspaceBuilder addPrecomputedValue(PrecomputedValue.Injected precomputedValue) {
- this.precomputedValues.add(Preconditions.checkNotNull(precomputedValue));
- return this;
- }
-
public WorkspaceBuilder addCustomDirtinessChecker(
SkyValueDirtinessChecker customDirtinessChecker) {
this.customDirtinessCheckers.add(Preconditions.checkNotNull(customDirtinessChecker));
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java
index d6b0e95e57..5f7c242428 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java
@@ -47,7 +47,7 @@ public final class PrecomputedValue implements SkyValue {
* An externally-injected precomputed value. Exists so that modules can inject precomputed values
* into Skyframe's graph.
*
- * @see com.google.devtools.build.lib.runtime.WorkspaceBuilder#addPrecomputedValue
+ * @see com.google.devtools.build.lib.runtime.BlazeModule#getPrecomputedValues
*/
public static final class Injected {
private final Precomputed<?> precomputed;
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
index d0b479b897..1e81ad4815 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
@@ -120,7 +120,6 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories,
Predicate<PathFragment> allowedMissingInputs,
ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
- ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues,
Iterable<SkyValueDirtinessChecker> customDirtinessCheckers,
PathFragment blacklistedPackagePrefixesFile,
CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy,
@@ -135,7 +134,6 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
buildInfoFactories,
allowedMissingInputs,
extraSkyFunctions,
- extraPrecomputedValues,
ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS,
blacklistedPackagePrefixesFile,
crossRepositoryLabelViolationStrategy,
@@ -154,7 +152,6 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories,
Predicate<PathFragment> allowedMissingInputs,
ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
- ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues,
Iterable<SkyValueDirtinessChecker> customDirtinessCheckers,
PathFragment blacklistedPackagePrefixesFile,
CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy,
@@ -171,7 +168,6 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
diffAwarenessFactories,
allowedMissingInputs,
extraSkyFunctions,
- extraPrecomputedValues,
customDirtinessCheckers,
blacklistedPackagePrefixesFile,
crossRepositoryLabelViolationStrategy,
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorFactory.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorFactory.java
index 6173e8a8ee..5c00deb30d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorFactory.java
@@ -40,7 +40,6 @@ public class SequencedSkyframeExecutorFactory implements SkyframeExecutorFactory
Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories,
Predicate<PathFragment> allowedMissingInputs,
ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
- ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues,
Iterable<SkyValueDirtinessChecker> customDirtinessCheckers) {
return SequencedSkyframeExecutor.create(
pkgFactory,
@@ -51,7 +50,6 @@ public class SequencedSkyframeExecutorFactory implements SkyframeExecutorFactory
diffAwarenessFactories,
allowedMissingInputs,
extraSkyFunctions,
- extraPrecomputedValues,
customDirtinessCheckers,
PathFragment.EMPTY_FRAGMENT,
BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY,
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index a25c8c2721..08eea1fe01 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -264,7 +264,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
private final BinTools binTools;
private boolean needToInjectEmbeddedArtifacts = true;
- private boolean needToInjectPrecomputedValuesForAnalysis = true;
protected int modifiedFiles;
protected int outputDirtyFiles;
protected int modifiedFilesDuringPreviousBuild;
@@ -272,7 +271,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
private final ExternalFileAction externalFileAction;
private final ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions;
- private final ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues;
protected SkyframeIncrementalBuildMonitor incrementalBuildMonitor =
new SkyframeIncrementalBuildMonitor();
@@ -305,7 +303,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
ImmutableList<BuildInfoFactory> buildInfoFactories,
Predicate<PathFragment> allowedMissingInputs,
ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
- ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues,
ExternalFileAction externalFileAction,
PathFragment blacklistedPackagePrefixesFile,
CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy,
@@ -330,7 +327,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
this.buildInfoFactories = factoryMapBuilder.build();
this.allowedMissingInputs = allowedMissingInputs;
this.extraSkyFunctions = extraSkyFunctions;
- this.extraPrecomputedValues = extraPrecomputedValues;
this.externalFileAction = externalFileAction;
this.blacklistedPackagePrefixesFile = blacklistedPackagePrefixesFile;
this.binTools = binTools;
@@ -641,7 +637,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
*/
private void reinjectConstantValuesLazily() {
needToInjectEmbeddedArtifacts = true;
- needToInjectPrecomputedValuesForAnalysis = true;
}
/**
@@ -718,13 +713,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
PrecomputedValue.SKYLARK_SEMANTICS.set(injectable(), skylarkSemanticsOptions);
}
- protected void maybeInjectPrecomputedValuesForAnalysis() {
- if (needToInjectPrecomputedValuesForAnalysis) {
- injectExtraPrecomputedValues(extraPrecomputedValues);
- needToInjectPrecomputedValuesForAnalysis = false;
- }
- }
-
public void injectExtraPrecomputedValues(
List<PrecomputedValue.Injected> extraPrecomputedValues) {
for (PrecomputedValue.Injected injected : extraPrecomputedValues) {
@@ -981,7 +969,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
setActive(true);
this.tsgm.set(tsgm);
- maybeInjectPrecomputedValuesForAnalysis();
setCommandId(commandId);
PrecomputedValue.ACTION_ENV.set(injectable(), actionEnv);
this.clientEnv.set(clientEnv);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutorFactory.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutorFactory.java
index 225ffd3e7b..4ed5361730 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutorFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutorFactory.java
@@ -43,7 +43,6 @@ public interface SkyframeExecutorFactory {
* @param diffAwarenessFactories
* @param allowedMissingInputs
* @param extraSkyFunctions
- * @param extraPrecomputedValues
* @param customDirtinessCheckers
* @return an instance of the SkyframeExecutor
* @throws AbruptExitException if the executor cannot be created
@@ -57,7 +56,6 @@ public interface SkyframeExecutorFactory {
Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories,
Predicate<PathFragment> allowedMissingInputs,
ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
- ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues,
Iterable<SkyValueDirtinessChecker> customDirtinessCheckers)
throws AbruptExitException;
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index 4759128dc0..c77466945c 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -180,7 +180,6 @@ public abstract class AnalysisTestCase extends FoundationTestCase {
ImmutableList.<DiffAwareness.Factory>of(),
Predicates.<PathFragment>alwaysFalse(),
analysisMock.getSkyFunctions(directories),
- ImmutableList.of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY,
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 7347b4d11f..faee80dd01 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -238,7 +238,6 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
ImmutableList.<DiffAwareness.Factory>of(),
Predicates.<PathFragment>alwaysFalse(),
analysisMock.getSkyFunctions(directories),
- ImmutableList.of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY,
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
index 2270cc6ff9..7f2360b986 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -122,7 +122,6 @@ public abstract class ConfigurationTestCase extends FoundationTestCase {
ImmutableList.<DiffAwareness.Factory>of(),
Predicates.<PathFragment>alwaysFalse(),
analysisMock.getSkyFunctions(directories),
- ImmutableList.<PrecomputedValue.Injected>of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY,
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
index c6c32e590d..486fb64e79 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
@@ -37,7 +37,6 @@ import com.google.devtools.build.lib.pkgcache.PackageManager;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
import com.google.devtools.build.lib.skyframe.DiffAwareness;
-import com.google.devtools.build.lib.skyframe.PrecomputedValue;
import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor;
import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
@@ -120,7 +119,6 @@ public abstract class PackageLoadingTestCase extends FoundationTestCase {
ImmutableList.<DiffAwareness.Factory>of(),
Predicates.<PathFragment>alwaysFalse(),
ImmutableMap.<SkyFunctionName, SkyFunction>of(),
- ImmutableList.<PrecomputedValue.Injected>of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY,
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
index 04a46359bd..e26ed61a36 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
@@ -28,7 +28,6 @@ import com.google.devtools.build.lib.packages.NoSuchPackageException;
import com.google.devtools.build.lib.packages.Package;
import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
import com.google.devtools.build.lib.skyframe.DiffAwareness;
-import com.google.devtools.build.lib.skyframe.PrecomputedValue;
import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor;
import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
@@ -90,7 +89,6 @@ public class BuildFileModificationTest extends FoundationTestCase {
ImmutableList.<DiffAwareness.Factory>of(),
Predicates.<PathFragment>alwaysFalse(),
analysisMock.getSkyFunctions(directories),
- ImmutableList.<PrecomputedValue.Injected>of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY,
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
index d88c2c7bad..710be7fa1c 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
@@ -36,7 +36,6 @@ import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.util.LoadingMock;
import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
import com.google.devtools.build.lib.skyframe.DiffAwareness;
-import com.google.devtools.build.lib.skyframe.PrecomputedValue;
import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor;
import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
@@ -480,7 +479,6 @@ public class IncrementalLoadingTest {
ImmutableList.of(new ManualDiffAwarenessFactory()),
Predicates.<PathFragment>alwaysFalse(),
ImmutableMap.<SkyFunctionName, SkyFunction>of(),
- ImmutableList.<PrecomputedValue.Injected>of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY,
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
index 26a85c9ffd..12a3b95ca5 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
@@ -41,7 +41,6 @@ import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.util.MockToolsConfig;
import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
import com.google.devtools.build.lib.skyframe.DiffAwareness;
-import com.google.devtools.build.lib.skyframe.PrecomputedValue;
import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor;
import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
@@ -629,7 +628,6 @@ public class LoadingPhaseRunnerTest {
ImmutableList.<DiffAwareness.Factory>of(),
Predicates.<PathFragment>alwaysFalse(),
analysisMock.getSkyFunctions(directories),
- ImmutableList.<PrecomputedValue.Injected>of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY,
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
index 0035576b17..b44a74f72e 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
@@ -37,7 +37,6 @@ import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
import com.google.devtools.build.lib.skyframe.DiffAwareness;
-import com.google.devtools.build.lib.skyframe.PrecomputedValue;
import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor;
import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
@@ -99,7 +98,6 @@ public class PackageCacheTest extends FoundationTestCase {
ImmutableList.<DiffAwareness.Factory>of(),
Predicates.<PathFragment>alwaysFalse(),
analysisMock.getSkyFunctions(directories),
- ImmutableList.<PrecomputedValue.Injected>of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
PathFragment.EMPTY_FRAGMENT,
BazelSkyframeExecutorConstants.CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY,