diff options
| author |  Michael Staib <mstaib@google.com> | 2015-10-05 18:07:47 +0000 |
|---|---|---|
| committer |  Laszlo Csomor <laszlocsomor@google.com> | 2015-10-06 07:03:38 +0000 |
| commit | 2f746b3df971de42ea1222f4bb6851f8fd5e1e11 (patch) | |
| tree | af4b3eeb29fe2701d4e9d53929b3906685ed0005 /src/main/java/com/google | |
| parent | bf01d8424cae8a1c141106c26fab44a2c3c6f85b (diff) | |
Remove extraneous check in DependencyResolver.
At this point in the method we already know that aspect != null,
because we're in the else-branch of an if (aspect == null).
--
MOS_MIGRATED_REVID=104674784
Diffstat (limited to 'src/main/java/com/google')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java index d0aff0f704..63e90125fa 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java @@ -260,9 +260,7 @@ public abstract class DependencyResolver { } else { attributes = new ArrayList<>(); attributes.addAll(rule.getRuleClassObject().getAttributes()); - if (aspect != null) { - attributes.addAll(aspect.getAttributes().values()); - } + attributes.addAll(aspect.getAttributes().values()); } ImmutableSortedKeyListMultimap.Builder<Attribute, LabelAndConfiguration> result = |