diff options
| author |  janakr <janakr@google.com> | 2018-03-10 09:42:03 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-10 09:43:33 -0800 |
| commit | b1d26181469bbabc72239bdf6bd0abedb3bfcbd3 (patch) | |
| tree | 29c05dd6160c14ea125e2ba2b64c128dc66bc856 | |
| parent | 189adbce04d9b839043996df69ca8375ebbf038d (diff) | |
Explicitly don't serialize/deserialize Package objects in ConfiguredTargetValue. The nested set of packages isn't usually set when serializing/deserializing, but it's good to be explicit, especially in tests.
PiperOrigin-RevId: 188605043
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/NonRuleConfiguredTargetValue.java | 8 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/RuleConfiguredTargetValue.java | 10 |
2 files changed, 10 insertions, 8 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 b36318bede..7d592dfcc2 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 @@ -54,11 +54,11 @@ public final class NonRuleConfiguredTargetValue NonRuleConfiguredTargetValue( ArrayList<ActionAnalysisMetadata> actions, ImmutableMap<Artifact, Integer> generatingActionIndex, - ConfiguredTarget configuredTarget, - NestedSet<Package> transitivePackagesForPackageRootResolution) { - super(actions, generatingActionIndex, false); + ConfiguredTarget configuredTarget) { + super(actions, generatingActionIndex, /*removeActionsAfterEvaluation=*/ false); this.configuredTarget = configuredTarget; - this.transitivePackagesForPackageRootResolution = transitivePackagesForPackageRootResolution; + // Transitive packages are not serialized. + this.transitivePackagesForPackageRootResolution = null; } NonRuleConfiguredTargetValue( diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RuleConfiguredTargetValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/RuleConfiguredTargetValue.java index 8eaa0163d5..abe1c70e66 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/RuleConfiguredTargetValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/RuleConfiguredTargetValue.java @@ -48,11 +48,13 @@ public final class RuleConfiguredTargetValue extends ActionLookupValue // May be null either after clearing or because transitive packages are not tracked. @Nullable private NestedSet<Package> transitivePackagesForPackageRootResolution; + // Transitive packages are not serialized. @AutoCodec.Instantiator - RuleConfiguredTargetValue( - RuleConfiguredTarget configuredTarget, - @Nullable NestedSet<Package> transitivePackagesForPackageRootResolution) { - this(configuredTarget, transitivePackagesForPackageRootResolution, false); + RuleConfiguredTargetValue(RuleConfiguredTarget configuredTarget) { + this( + configuredTarget, + /*transitivePackagesForPackageRootResolution=*/ null, + /*removeActionsAfterEvaluation=*/ false); } RuleConfiguredTargetValue( |