diff options
| author |  janakr <janakr@google.com> | 2018-03-05 08:25:25 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-05 08:27:29 -0800 |
| commit | b54f0c5aa5d8f95c7178103fba4ebc545983f6d2 (patch) | |
| tree | 767d1e69196d5621925076170729d53f9ba55413 /src/main/java/com/google/devtools/build/lib/actions/ActionLookupValue.java | |
| parent | 29bf55b32702303c100e9b9a5fbac806f7c779bf (diff) | |
Automated rollback of commit 96145511b34a2d7be834e3eb05927674e875c813.
*** Reason for rollback ***
Fixed issue that led to rollback.
RELNOTES: None
*** Original change description ***
Automated rollback of commit eee53d3a33dde441f7e7adaecde81ef2d3db7c1b.
*** Reason for rollback ***
breaks Blaze_CorpTest
*** Original change description ***
@AutoCodec ConfiguredTargetValue.
PiperOrigin-RevId: 187869560
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/actions/ActionLookupValue.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/actions/ActionLookupValue.java | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionLookupValue.java b/src/main/java/com/google/devtools/build/lib/actions/ActionLookupValue.java index 510b0b1f5f..bbc34931b9 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ActionLookupValue.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ActionLookupValue.java @@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; +import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; import java.util.ArrayList; @@ -36,7 +37,7 @@ import javax.annotation.Nullable; */ public class ActionLookupValue implements SkyValue { protected final List<ActionAnalysisMetadata> actions; - private final ImmutableMap<Artifact, Integer> generatingActionIndex; + @VisibleForSerialization protected final ImmutableMap<Artifact, Integer> generatingActionIndex; protected ActionLookupValue( ActionAnalysisMetadata action, @@ -47,12 +48,17 @@ public class ActionLookupValue implements SkyValue { @VisibleForTesting public ActionLookupValue( Actions.GeneratingActions generatingActions, boolean removeActionsAfterEvaluation) { - if (removeActionsAfterEvaluation) { - this.actions = new ArrayList<>(generatingActions.getActions()); - } else { - this.actions = ImmutableList.copyOf(generatingActions.getActions()); - } - this.generatingActionIndex = generatingActions.getGeneratingActionIndex(); + this( + removeActionsAfterEvaluation + ? new ArrayList<>(generatingActions.getActions()) + : ImmutableList.copyOf(generatingActions.getActions()), + generatingActions.getGeneratingActionIndex()); + } + + protected ActionLookupValue( + List<ActionAnalysisMetadata> actions, ImmutableMap<Artifact, Integer> generatingActionIndex) { + this.actions = actions; + this.generatingActionIndex = generatingActionIndex; } /** |