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

5 files changed, 1 insertions, 22 deletions

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;
 }