diff options
author | 2018-06-18 16:16:36 -0700 | |
---|---|---|
committer | 2018-06-18 16:18:08 -0700 | |
commit | 9e91f20bb31e44b4be836996ac9d91af61e1e822 (patch) | |
tree | 7e7c116290099ef5a8e16e67a9d4f5a0c908fbf9 /src/main/java/com/google/devtools/build/lib/skyframe/NonRuleConfiguredTargetValue.java | |
parent | d4406d644efcf86327834a56b01cc212389e52e7 (diff) |
Remove support for --discard_actions_after_execution.
The memory savings from this flag are not worth the complexity, and it interferes with action restarting.
RELNOTES: Remove support for --discard_actions_after_execution.
PiperOrigin-RevId: 201077905
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/NonRuleConfiguredTargetValue.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/NonRuleConfiguredTargetValue.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/NonRuleConfiguredTargetValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/NonRuleConfiguredTargetValue.java index d2bc256b4c..82924e0f38 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/NonRuleConfiguredTargetValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/NonRuleConfiguredTargetValue.java @@ -15,6 +15,7 @@ package com.google.devtools.build.lib.skyframe; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.ActionAnalysisMetadata; import com.google.devtools.build.lib.actions.Actions.GeneratingActions; @@ -30,7 +31,6 @@ import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.skyframe.SkyKey; -import java.util.ArrayList; import javax.annotation.Nullable; /** A non-rule configured target in the context of a Skyframe graph. */ @@ -52,10 +52,10 @@ public final class NonRuleConfiguredTargetValue extends BasicActionLookupValue @AutoCodec.Instantiator @VisibleForSerialization NonRuleConfiguredTargetValue( - ArrayList<ActionAnalysisMetadata> actions, + ImmutableList<ActionAnalysisMetadata> actions, ImmutableMap<Artifact, Integer> generatingActionIndex, ConfiguredTarget configuredTarget) { - super(actions, generatingActionIndex, /*removeActionsAfterEvaluation=*/ false); + super(actions, generatingActionIndex); this.configuredTarget = configuredTarget; // Transitive packages are not serialized. this.transitivePackagesForPackageRootResolution = null; @@ -64,9 +64,8 @@ public final class NonRuleConfiguredTargetValue extends BasicActionLookupValue NonRuleConfiguredTargetValue( ConfiguredTarget configuredTarget, GeneratingActions generatingActions, - @Nullable NestedSet<Package> transitivePackagesForPackageRootResolution, - boolean removeActionsAfterEvaluation) { - super(generatingActions, removeActionsAfterEvaluation); + @Nullable NestedSet<Package> transitivePackagesForPackageRootResolution) { + super(generatingActions); this.configuredTarget = Preconditions.checkNotNull(configuredTarget, generatingActions); this.transitivePackagesForPackageRootResolution = transitivePackagesForPackageRootResolution; } @@ -80,7 +79,7 @@ public final class NonRuleConfiguredTargetValue extends BasicActionLookupValue @VisibleForTesting @Override - public ArrayList<ActionAnalysisMetadata> getActions() { + public ImmutableList<ActionAnalysisMetadata> getActions() { Preconditions.checkNotNull(configuredTarget, this); return actions; } |