diff options
author | 2018-03-26 12:08:22 -0700 | |
---|---|---|
committer | 2018-03-26 12:13:56 -0700 | |
commit | 816abfc691bec1b16e57d5f2e93edac176527848 (patch) | |
tree | c954bdecd34ee347d0ae62053f2e2cd7c113186d /src/main/java | |
parent | 8acb017b6625cb0d306966496ccb336f8dd35722 (diff) |
Get rid of some more #getConfiguration calls.
PiperOrigin-RevId: 190502786
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/Util.java | 14 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Util.java b/src/main/java/com/google/devtools/build/lib/analysis/Util.java index 2c2e178206..47336c0d78 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/Util.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/Util.java @@ -28,7 +28,6 @@ import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey; import com.google.devtools.build.lib.vfs.PathFragment; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; /** * Utility methods for use by ConfiguredTarget implementations. @@ -115,18 +114,17 @@ public abstract class Util { private static void addLabelsAndConfigs( Set<ConfiguredTargetKey> set, List<ConfiguredTargetAndData> deps) { - for (ConfiguredTarget dep : - deps.stream() - .map(ConfiguredTargetAndData::getConfiguredTarget) - .collect(Collectors.toList())) { + for (ConfiguredTargetAndData dep : deps) { // This must be done because {@link AliasConfiguredTarget#getLabel} returns the label of the // "actual" configured target instead of the alias. - if (dep instanceof AliasConfiguredTarget) { + if (dep.getConfiguredTarget() instanceof AliasConfiguredTarget) { set.add( ConfiguredTargetKey.of( - ((AliasConfiguredTarget) dep).getOriginalLabel(), dep.getConfiguration())); + ((AliasConfiguredTarget) dep.getConfiguredTarget()).getOriginalLabel(), + dep.getConfiguration())); } else { - set.add(ConfiguredTargetKey.of(dep.getLabel(), dep.getConfiguration())); + set.add( + ConfiguredTargetKey.of(dep.getConfiguredTarget().getLabel(), dep.getConfiguration())); } } } diff --git a/src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java b/src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java index cd48b94264..76800637fe 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java +++ b/src/main/java/com/google/devtools/build/lib/query2/TransitionsOutputFormatterCallback.java @@ -116,7 +116,9 @@ public class TransitionsOutputFormatterCallback ct -> partialResultMap.put(ct.getLabel(), accessor.getTargetFromConfiguredTarget(ct))); for (ConfiguredTarget configuredTarget : partialResult) { Target target = partialResultMap.get(configuredTarget.getLabel()); - BuildConfiguration config = configuredTarget.getConfiguration(); + BuildConfiguration config = + skyframeExecutor.getConfiguration( + NullEventHandler.INSTANCE, configuredTarget.getConfigurationKey()); addResult( getRuleClassTransition(configuredTarget, target) + configuredTarget.getLabel() @@ -280,7 +282,7 @@ public class TransitionsOutputFormatterCallback Iterable<BuildOptions> buildOptions, BuildOptions defaultOptions) { Preconditions.checkArgument( - ct.getConfiguration().fragmentClasses().equals(fragments), + ct.getConfigurationKey().getFragments().equals(fragments.fragmentClasses()), "Mismatch: %s %s", ct, fragments); |