From cd477f266e9b896e290d1830b822ca392d9f2114 Mon Sep 17 00:00:00 2001
From: jhorvitz <jhorvitz@google.com>
Date: Wed, 5 May 2021 10:18:22 -0700
Subject: [PATCH] Pass only the top-level artifacts to
 `ExecutorLifecycleListener` and make the computation more efficient.

Delete the now unused `ArtifactsToOwnerLabels`.

PiperOrigin-RevId: 372152937
---
 .../build/lib/analysis/AnalysisResult.java    |  13 +-
 .../lib/analysis/ArtifactsToOwnerLabels.java  | 125 ------------------
 .../google/devtools/build/lib/analysis/BUILD  |  13 --
 .../build/lib/analysis/BuildView.java         |  80 +++++------
 .../build/lib/analysis/OutputGroupInfo.java   |  11 +-
 .../lib/analysis/TopLevelArtifactHelper.java  |  93 ++++++-------
 .../build/lib/buildtool/ExecutionTool.java    |  17 +--
 .../com/google/devtools/build/lib/exec/BUILD  |   2 +-
 .../lib/exec/ExecutorLifecycleListener.java   |  10 +-
 .../devtools/build/lib/includescanning/BUILD  |   2 -
 .../IncludeScannerSupplier.java               |   2 +-
 .../IncludeScanningModule.java                |  12 +-
 .../includescanning/LegacyIncludeScanner.java |  12 +-
 .../google/devtools/build/lib/remote/BUILD    |   1 -
 .../remote/RemoteActionContextProvider.java   |  12 +-
 .../analysis/ArtifactsToOwnerLabelsTest.java  |  65 ---------
 .../build/lib/analysis/AspectTest.java        |  18 +--
 .../google/devtools/build/lib/analysis/BUILD  |   1 -
 .../build/lib/analysis/BuildViewTest.java     |   2 +-
 .../google/devtools/build/lib/buildtool/BUILD |   2 +-
 .../ContextProviderInitializationTest.java    |  11 +-
 .../starlark/StarlarkDefinedAspectsTest.java  |  61 ++++-----
 22 files changed, 160 insertions(+), 405 deletions(-)
 delete mode 100644 src/main/java/com/google/devtools/build/lib/analysis/ArtifactsToOwnerLabels.java
 delete mode 100644 src/test/java/com/google/devtools/build/lib/analysis/ArtifactsToOwnerLabelsTest.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java
index 3c63b346de8f85..bd6d48e56e29e3 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisResult.java
@@ -20,6 +20,7 @@
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Sets;
 import com.google.devtools.build.lib.actions.ActionGraph;
+import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.PackageRoots;
 import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection;
 import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
@@ -37,7 +38,7 @@ public final class AnalysisResult {
   private final ImmutableSet<ConfiguredTarget> targetsToSkip;
   @Nullable private final FailureDetail failureDetail;
   private final ActionGraph actionGraph;
-  private final ArtifactsToOwnerLabels topLevelArtifactsToOwnerLabels;
+  private final ImmutableSet<Artifact> artifactsToBuild;
   private final ImmutableSet<ConfiguredTarget> parallelTests;
   private final ImmutableSet<ConfiguredTarget> exclusiveTests;
   @Nullable private final TopLevelArtifactContext topLevelContext;
@@ -55,7 +56,7 @@ public final class AnalysisResult {
       ImmutableSet<ConfiguredTarget> targetsToSkip,
       @Nullable FailureDetail failureDetail,
       ActionGraph actionGraph,
-      ArtifactsToOwnerLabels topLevelArtifactsToOwnerLabels,
+      ImmutableSet<Artifact> artifactsToBuild,
       ImmutableSet<ConfiguredTarget> parallelTests,
       ImmutableSet<ConfiguredTarget> exclusiveTests,
       TopLevelArtifactContext topLevelContext,
@@ -70,7 +71,7 @@ public final class AnalysisResult {
     this.targetsToSkip = targetsToSkip;
     this.failureDetail = failureDetail;
     this.actionGraph = actionGraph;
-    this.topLevelArtifactsToOwnerLabels = topLevelArtifactsToOwnerLabels;
+    this.artifactsToBuild = artifactsToBuild;
     this.parallelTests = parallelTests;
     this.exclusiveTests = exclusiveTests;
     this.topLevelContext = topLevelContext;
@@ -120,8 +121,8 @@ public ImmutableSet<ConfiguredTarget> getTargetsToSkip() {
     return targetsToSkip;
   }
 
-  public ArtifactsToOwnerLabels getTopLevelArtifactsToOwnerLabels() {
-    return topLevelArtifactsToOwnerLabels;
+  public ImmutableSet<Artifact> getArtifactsToBuild() {
+    return artifactsToBuild;
   }
 
   public ImmutableSet<ConfiguredTarget> getExclusiveTests() {
@@ -178,7 +179,7 @@ public AnalysisResult withExclusiveTestsAsParallelTests() {
         targetsToSkip,
         failureDetail,
         actionGraph,
-        topLevelArtifactsToOwnerLabels,
+        artifactsToBuild,
         Sets.union(parallelTests, exclusiveTests).immutableCopy(),
         /*exclusiveTests=*/ ImmutableSet.of(),
         topLevelContext,
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ArtifactsToOwnerLabels.java b/src/main/java/com/google/devtools/build/lib/analysis/ArtifactsToOwnerLabels.java
deleted file mode 100644
index 12fbb160fb582a..00000000000000
--- a/src/main/java/com/google/devtools/build/lib/analysis/ArtifactsToOwnerLabels.java
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2018 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package com.google.devtools.build.lib.analysis;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.SetMultimap;
-import com.google.common.collect.Sets;
-import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.cmdline.Label;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Predicate;
-
-/**
- * Morally a {@link SetMultimap} from artifacts to the labels that own them, which may not be just
- * {@link Artifact#getOwnerLabel} depending on the build. Optimizes for artifacts that are owned by
- * their {@link Artifact#getOwnerLabel} by storing them separately.
- */
-public class ArtifactsToOwnerLabels {
-  private final SetMultimap<Artifact, Label> artifactToMultipleOrDifferentOwnerLabels;
-  private final Set<Artifact> artifactsOwnedOnlyByTheirLabels;
-
-  private ArtifactsToOwnerLabels(
-      SetMultimap<Artifact, Label> artifactToMultipleOrDifferentOwnerLabels,
-      Set<Artifact> artifactsOwnedOnlyByTheirLabels) {
-    this.artifactToMultipleOrDifferentOwnerLabels = artifactToMultipleOrDifferentOwnerLabels;
-    this.artifactsOwnedOnlyByTheirLabels = artifactsOwnedOnlyByTheirLabels;
-  }
-
-  public Set<Label> getOwners(Artifact artifact) {
-    if (artifactsOwnedOnlyByTheirLabels.contains(artifact)) {
-      Preconditions.checkState(
-          !artifactToMultipleOrDifferentOwnerLabels.containsKey(artifact),
-          "Artifact %s incorrectly in multiple categories",
-          artifact);
-      Label ownerLabel = artifact.getOwnerLabel();
-      if (ownerLabel == null) {
-        return ImmutableSet.of();
-      }
-      return ImmutableSet.of(ownerLabel);
-    }
-    return Preconditions.checkNotNull(
-        artifactToMultipleOrDifferentOwnerLabels.get(artifact), artifact);
-  }
-
-  public Set<Artifact> getArtifacts() {
-    return Sets.union(
-        artifactsOwnedOnlyByTheirLabels, artifactToMultipleOrDifferentOwnerLabels.keySet());
-  }
-
-  public Builder toBuilder() {
-    return new Builder(
-        HashMultimap.create(artifactToMultipleOrDifferentOwnerLabels),
-        new HashSet<>(artifactsOwnedOnlyByTheirLabels));
-  }
-
-  /** Builder for {@link ArtifactsToOwnerLabels}. */
-  public static class Builder {
-    private final SetMultimap<Artifact, Label> artifactToMultipleOrDifferentOwnerLabels;
-    private final Set<Artifact> artifactsOwnedOnlyByTheirLabels;
-
-    public Builder() {
-      this(HashMultimap.create(), new HashSet<>());
-    }
-
-    private Builder(
-        SetMultimap<Artifact, Label> artifactToMultipleOrDifferentOwnerLabels,
-        Set<Artifact> artifactsOwnedOnlyByTheirLabels) {
-      this.artifactToMultipleOrDifferentOwnerLabels = artifactToMultipleOrDifferentOwnerLabels;
-      this.artifactsOwnedOnlyByTheirLabels = artifactsOwnedOnlyByTheirLabels;
-    }
-
-    public Builder addArtifact(Artifact artifact) {
-      if (artifactToMultipleOrDifferentOwnerLabels.containsKey(artifact)) {
-        Label ownerLabel = artifact.getOwnerLabel();
-        if (ownerLabel != null) {
-          artifactToMultipleOrDifferentOwnerLabels.put(artifact, artifact.getOwnerLabel());
-        }
-      } else {
-        artifactsOwnedOnlyByTheirLabels.add(artifact);
-      }
-      return this;
-    }
-
-    public Builder addArtifact(Artifact artifact, Label label) {
-      Preconditions.checkNotNull(label, artifact);
-      if (label.equals(artifact.getOwnerLabel())) {
-        addArtifact(artifact);
-      } else {
-        artifactToMultipleOrDifferentOwnerLabels.put(artifact, label);
-        if (artifactsOwnedOnlyByTheirLabels.remove(artifact)) {
-          // Redoing this call now that we have a mismatched label will force addition into the
-          // multimap.
-          addArtifact(artifact);
-        }
-      }
-      return this;
-    }
-
-    public Builder filterArtifacts(Predicate<Artifact> artifactsToKeep) {
-      Predicate<Artifact> artifactsToRemove = artifactsToKeep.negate();
-      artifactToMultipleOrDifferentOwnerLabels.keySet().removeIf(artifactsToRemove);
-      artifactsOwnedOnlyByTheirLabels.removeIf(artifactsToRemove);
-      return this;
-    }
-
-    ArtifactsToOwnerLabels build() {
-      return new ArtifactsToOwnerLabels(
-          artifactToMultipleOrDifferentOwnerLabels, artifactsOwnedOnlyByTheirLabels);
-    }
-  }
-}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
index 407ea48899241a..30dc53d34c5d67 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -38,7 +38,6 @@ java_library(
         ":analysis_options",
         ":analysis_phase_complete_event",
         ":analysis_phase_started_event",
-        ":artifacts_to_owner_labels",
         ":aspect_aware_attribute_mapper",
         ":aspect_collection",
         ":aspect_configured_event",
@@ -282,7 +281,6 @@ java_library(
         ":actions/symlink_action",
         ":actions/template_expansion_action",
         ":actions_provider",
-        ":artifacts_to_owner_labels",
         ":aspect_aware_attribute_mapper",
         ":aspect_collection",
         ":build_setting_provider",
@@ -497,16 +495,6 @@ java_library(
     ],
 )
 
-java_library(
-    name = "artifacts_to_owner_labels",
-    srcs = ["ArtifactsToOwnerLabels.java"],
-    deps = [
-        "//src/main/java/com/google/devtools/build/lib/actions:artifacts",
-        "//src/main/java/com/google/devtools/build/lib/cmdline",
-        "//third_party:guava",
-    ],
-)
-
 java_library(
     name = "aspect_aware_attribute_mapper",
     srcs = ["AspectAwareAttributeMapper.java"],
@@ -599,7 +587,6 @@ java_library(
         ":analysis_cluster",
         ":analysis_options",
         ":analysis_phase_started_event",
-        ":artifacts_to_owner_labels",
         ":aspect_configured_event",
         ":blaze_directories",
         ":config/build_configuration",
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index ee61f222a805e0..bec43a1036d6bf 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -470,8 +470,7 @@ private AnalysisResult createResult(
       allTargetsToTest = filterTestsByTargets(configuredTargets, testsToRun);
     }
 
-    ArtifactsToOwnerLabels.Builder artifactsToOwnerLabelsBuilder =
-        new ArtifactsToOwnerLabels.Builder();
+    ImmutableSet.Builder<Artifact> artifactsToBuild = ImmutableSet.builder();
 
     // build-info and build-changelist.
     Collection<Artifact> buildInfoArtifacts =
@@ -480,11 +479,11 @@ private AnalysisResult createResult(
 
     // Extra actions
     addExtraActionsIfRequested(
-        viewOptions, configuredTargets, aspects, artifactsToOwnerLabelsBuilder, eventHandler);
+        viewOptions, configuredTargets, aspects, artifactsToBuild, eventHandler);
 
     // Coverage
     NestedSet<Artifact> baselineCoverageArtifacts =
-        getBaselineCoverageArtifacts(configuredTargets, artifactsToOwnerLabelsBuilder);
+        getBaselineCoverageArtifacts(configuredTargets, artifactsToBuild);
     if (coverageReportActionFactory != null) {
       CoverageReportActionsWrapper actionsWrapper;
       actionsWrapper =
@@ -501,23 +500,24 @@ private AnalysisResult createResult(
       if (actionsWrapper != null) {
         Actions.GeneratingActions actions = actionsWrapper.getActions();
         skyframeExecutor.injectCoverageReportData(actions);
-        actionsWrapper.getCoverageOutputs().forEach(artifactsToOwnerLabelsBuilder::addArtifact);
+        actionsWrapper.getCoverageOutputs().forEach(artifactsToBuild::add);
       }
     }
     // TODO(cparsons): If extra actions are ever removed, this filtering step can probably be
     //  removed as well: the only concern would be action conflicts involving coverage artifacts,
     //  which seems far-fetched.
     if (skyframeAnalysisResult.hasActionConflicts()) {
-      ArtifactsToOwnerLabels tempOwners = artifactsToOwnerLabelsBuilder.build();
       // We don't remove the (hopefully unnecessary) guard in SkyframeBuildView that enables/
       // disables analysis, since no new targets should actually be analyzed.
-      Set<Artifact> artifacts = tempOwners.getArtifacts();
+      ImmutableSet<Artifact> artifacts = artifactsToBuild.build();
       Predicate<Artifact> errorFreeArtifacts =
           skyframeExecutor.filterActionConflictsForTopLevelArtifacts(eventHandler, artifacts);
-      artifactsToOwnerLabelsBuilder = tempOwners.toBuilder().filterArtifacts(errorFreeArtifacts);
+
+      artifactsToBuild = ImmutableSet.builder();
+      artifacts.stream().filter(errorFreeArtifacts).forEach(artifactsToBuild::add);
     }
     // Build-info artifacts are always conflict-free, and can't be checked easily.
-    buildInfoArtifacts.forEach(artifactsToOwnerLabelsBuilder::addArtifact);
+    buildInfoArtifacts.forEach(artifactsToBuild::add);
 
     // Tests.
     Pair<ImmutableSet<ConfiguredTarget>, ImmutableSet<ConfiguredTarget>> testsPair =
@@ -529,8 +529,8 @@ private AnalysisResult createResult(
     FailureDetail failureDetail =
         createFailureDetail(loadingResult, skyframeAnalysisResult, topLevelTargetsWithConfigs);
 
-    final WalkableGraph graph = skyframeAnalysisResult.getWalkableGraph();
-    final ActionGraph actionGraph =
+    WalkableGraph graph = skyframeAnalysisResult.getWalkableGraph();
+    ActionGraph actionGraph =
         new ActionGraph() {
           @Nullable
           @Override
@@ -563,7 +563,7 @@ public ActionAnalysisMetadata getGeneratingAction(Artifact artifact) {
         ImmutableSet.copyOf(targetsToSkip),
         failureDetail,
         actionGraph,
-        artifactsToOwnerLabelsBuilder.build(),
+        artifactsToBuild.build(),
         parallelTests,
         exclusiveTests,
         topLevelOptions,
@@ -623,16 +623,12 @@ private static FailureDetail createFailureDetail(String errorMessage, Analysis.C
 
   private static NestedSet<Artifact> getBaselineCoverageArtifacts(
       Collection<ConfiguredTarget> configuredTargets,
-      ArtifactsToOwnerLabels.Builder topLevelArtifactsToOwnerLabels) {
+      ImmutableSet.Builder<Artifact> artifactsToBuild) {
     NestedSetBuilder<Artifact> baselineCoverageArtifacts = NestedSetBuilder.stableOrder();
     for (ConfiguredTarget target : configuredTargets) {
       InstrumentedFilesInfo provider = target.get(InstrumentedFilesInfo.STARLARK_CONSTRUCTOR);
       if (provider != null) {
-        TopLevelArtifactHelper.addArtifactsWithOwnerLabel(
-            provider.getBaselineCoverageArtifacts(),
-            null,
-            target.getLabel(),
-            topLevelArtifactsToOwnerLabels);
+        artifactsToBuild.addAll(provider.getBaselineCoverageArtifacts().toList());
         baselineCoverageArtifacts.addTransitive(provider.getBaselineCoverageArtifacts());
       }
     }
@@ -643,7 +639,7 @@ private void addExtraActionsIfRequested(
       AnalysisOptions viewOptions,
       Collection<ConfiguredTarget> configuredTargets,
       ImmutableMap<AspectKey, ConfiguredAspect> aspects,
-      ArtifactsToOwnerLabels.Builder artifactsToTopLevelLabelsMap,
+      ImmutableSet.Builder<Artifact> artifactsToBuild,
       ExtendedEventHandler eventHandler) {
     RegexFilter filter = viewOptions.extraActionFilter;
     for (ConfiguredTarget target : configuredTargets) {
@@ -663,24 +659,15 @@ private void addExtraActionsIfRequested(
           for (Attribute attr : actualTarget.getAssociatedRule().getAttributes()) {
             aspectClasses.addAll(attr.getAspectClasses());
           }
-          TopLevelArtifactHelper.addArtifactsWithOwnerLabel(
-              provider.getExtraActionArtifacts(),
-              filter,
-              target.getLabel(),
-              artifactsToTopLevelLabelsMap);
+          addArtifactsToBuilder(
+              provider.getExtraActionArtifacts().toList(), artifactsToBuild, filter);
           if (!aspectClasses.isEmpty()) {
-            TopLevelArtifactHelper.addArtifactsWithOwnerLabel(
-                filterTransitiveExtraActions(provider, aspectClasses),
-                filter,
-                target.getLabel(),
-                artifactsToTopLevelLabelsMap);
+            addArtifactsToBuilder(
+                filterTransitiveExtraActions(provider, aspectClasses), artifactsToBuild, filter);
           }
         } else {
-          TopLevelArtifactHelper.addArtifactsWithOwnerLabel(
-              provider.getTransitiveExtraActionArtifacts(),
-              filter,
-              target.getLabel(),
-              artifactsToTopLevelLabelsMap);
+          addArtifactsToBuilder(
+              provider.getTransitiveExtraActionArtifacts().toList(), artifactsToBuild, filter);
         }
       }
     }
@@ -689,22 +676,27 @@ private void addExtraActionsIfRequested(
           aspectEntry.getValue().getProvider(ExtraActionArtifactsProvider.class);
       if (provider != null) {
         if (viewOptions.extraActionTopLevelOnly) {
-          TopLevelArtifactHelper.addArtifactsWithOwnerLabel(
-              provider.getExtraActionArtifacts(),
-              filter,
-              aspectEntry.getKey().getLabel(),
-              artifactsToTopLevelLabelsMap);
+          addArtifactsToBuilder(
+              provider.getExtraActionArtifacts().toList(), artifactsToBuild, filter);
         } else {
-          TopLevelArtifactHelper.addArtifactsWithOwnerLabel(
-              provider.getTransitiveExtraActionArtifacts(),
-              filter,
-              aspectEntry.getKey().getLabel(),
-              artifactsToTopLevelLabelsMap);
+          addArtifactsToBuilder(
+              provider.getTransitiveExtraActionArtifacts().toList(), artifactsToBuild, filter);
         }
       }
     }
   }
 
+  private static void addArtifactsToBuilder(
+      List<? extends Artifact> artifacts,
+      ImmutableSet.Builder<Artifact> builder,
+      RegexFilter filter) {
+    for (Artifact artifact : artifacts) {
+      if (filter.isIncluded(artifact.getOwnerLabel().toString())) {
+        builder.add(artifact);
+      }
+    }
+  }
+
   /**
    * Returns a list of artifacts from 'provider' that were registered by an aspect from
    * 'aspectClasses'. All artifacts in 'provider' are considered - both direct and transitive.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java
index 1c1fc4c9e87e1f..9f395908feb72e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java
@@ -151,7 +151,7 @@ public enum ValidationMode {
      * Validation outputs built by {@code ValidateTarget} aspect "promoting" {@link #VALIDATION}
      * output group Blaze core collects to {@link #VALIDATION_TOP_LEVEL} and requesting the latter.
      */
-    ASPECT;
+    ASPECT
   }
 
   private final ImmutableMap<String, NestedSet<Artifact>> outputGroups;
@@ -182,9 +182,8 @@ public static OutputGroupInfo get(ProviderCollection collection) {
    *     If the specified output group is not present, the empty set is returned.
    */
   public NestedSet<Artifact> getOutputGroup(String outputGroupName) {
-    return outputGroups.containsKey(outputGroupName)
-        ? outputGroups.get(outputGroupName)
-        : NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER);
+    return outputGroups.getOrDefault(
+        outputGroupName, NestedSetBuilder.emptySet(Order.STABLE_ORDER));
   }
 
   /**
@@ -195,7 +194,7 @@ public NestedSet<Artifact> getOutputGroup(String outputGroupName) {
   @Nullable
   public static OutputGroupInfo merge(List<OutputGroupInfo> providers)
       throws DuplicateException {
-    if (providers.size() == 0) {
+    if (providers.isEmpty()) {
       return null;
     }
     if (providers.size() == 1) {
@@ -293,7 +292,7 @@ public Object getIndex(StarlarkSemantics semantics, Object key) throws EvalExcep
   }
 
   @Override
-  public boolean containsKey(StarlarkSemantics semantics, Object key) throws EvalException {
+  public boolean containsKey(StarlarkSemantics semantics, Object key) {
     return outputGroups.containsKey(key);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java
index 060d5e99ffa792..6c02cf3e4249da 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java
@@ -14,26 +14,22 @@
 
 package com.google.devtools.build.lib.analysis;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.test.TestProvider;
-import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet.Node;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.profiler.AutoProfiler;
 import com.google.devtools.build.lib.profiler.GoogleAutoProfilerUtils;
-import com.google.devtools.build.lib.skyframe.AspectValueKey.AspectKey;
-import com.google.devtools.build.lib.util.RegexFilter;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -127,61 +123,48 @@ private TopLevelArtifactHelper() {
 
   private static final Duration MIN_LOGGING = Duration.ofMillis(10);
 
-  @VisibleForTesting
-  public static ArtifactsToOwnerLabels makeTopLevelArtifactsToOwnerLabels(
-      AnalysisResult analysisResult) {
+  /**
+   * Returns the set of all top-level output artifacts.
+   *
+   * <p>In contrast with {@link AnalysisResult#getArtifactsToBuild}, which only returns artifacts to
+   * request from the build tool, this method returns <em>all</em> artifacts produced by top-level
+   * targets (including tests) and aspects.
+   */
+  public static ImmutableSet<Artifact> findAllTopLevelArtifacts(AnalysisResult analysisResult) {
     try (AutoProfiler ignored =
-        GoogleAutoProfilerUtils.logged("assigning owner labels", MIN_LOGGING)) {
-      ArtifactsToOwnerLabels.Builder artifactsToOwnerLabelsBuilder =
-          analysisResult.getTopLevelArtifactsToOwnerLabels().toBuilder();
-      TopLevelArtifactContext artifactContext = analysisResult.getTopLevelContext();
-      for (ConfiguredTarget target : analysisResult.getTargetsToBuild()) {
-        addArtifactsWithOwnerLabel(
-            getAllArtifactsToBuild(target, artifactContext).getAllArtifacts(),
-            null,
-            target.getLabel(),
-            artifactsToOwnerLabelsBuilder);
-      }
-      for (Map.Entry<AspectKey, ConfiguredAspect> aspectEntry :
-          analysisResult.getAspectsMap().entrySet()) {
-        addArtifactsWithOwnerLabel(
-            getAllArtifactsToBuild(aspectEntry.getValue(), artifactContext).getAllArtifacts(),
-            null,
-            aspectEntry.getKey().getLabel(),
-            artifactsToOwnerLabelsBuilder);
-      }
-      if (analysisResult.getTargetsToTest() != null) {
-        for (ConfiguredTarget target : analysisResult.getTargetsToTest()) {
-          addArtifactsWithOwnerLabel(
-              TestProvider.getTestStatusArtifacts(target),
-              null,
-              target.getLabel(),
-              artifactsToOwnerLabelsBuilder);
+        GoogleAutoProfilerUtils.logged("finding top level artifacts", MIN_LOGGING)) {
+
+      ImmutableSet.Builder<Artifact> artifacts = ImmutableSet.builder();
+      artifacts.addAll(analysisResult.getArtifactsToBuild());
+
+      Iterable<ProviderCollection> providers =
+          Iterables.concat(
+              analysisResult.getTargetsToBuild(),
+              analysisResult.getAspectsMap().values(),
+              firstNonNull(analysisResult.getTargetsToTest(), ImmutableList.of()));
+      TopLevelArtifactContext ctx = analysisResult.getTopLevelContext();
+      Set<NestedSet.Node> visited = new HashSet<>();
+
+      for (ProviderCollection provider : providers) {
+        for (ArtifactsInOutputGroup group :
+            getAllArtifactsToBuild(provider, ctx).getAllArtifactsByOutputGroup().values()) {
+          memoizedAddAll(group.getArtifacts(), artifacts, visited);
         }
       }
-      // TODO(dslomov): Artifacts to test from aspects?
-      return artifactsToOwnerLabelsBuilder.build();
+      return artifacts.build();
     }
   }
 
-  public static void addArtifactsWithOwnerLabel(
-      NestedSet<? extends Artifact> artifacts,
-      @Nullable RegexFilter filter,
-      Label ownerLabel,
-      ArtifactsToOwnerLabels.Builder artifactsToOwnerLabelsBuilder) {
-    addArtifactsWithOwnerLabel(
-        artifacts.toList(), filter, ownerLabel, artifactsToOwnerLabelsBuilder);
-  }
-
-  public static void addArtifactsWithOwnerLabel(
-      Collection<? extends Artifact> artifacts,
-      @Nullable RegexFilter filter,
-      Label ownerLabel,
-      ArtifactsToOwnerLabels.Builder artifactsToOwnerLabelsBuilder) {
-    for (Artifact artifact : artifacts) {
-      if (filter == null || filter.isIncluded(artifact.getOwnerLabel().toString())) {
-        artifactsToOwnerLabelsBuilder.addArtifact(artifact, ownerLabel);
-      }
+  private static void memoizedAddAll(
+      NestedSet<Artifact> current,
+      ImmutableSet.Builder<Artifact> artifacts,
+      Set<NestedSet.Node> visited) {
+    if (!visited.add(current.toNode())) {
+      return;
+    }
+    artifacts.addAll(current.getLeaves());
+    for (NestedSet<Artifact> child : current.getNonLeaves()) {
+      memoizedAddAll(child, artifacts, visited);
     }
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index 50a6d96858dbd7..a7bf2aa3265020 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -103,6 +103,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -192,9 +193,7 @@ public class ExecutionTool {
     actionContextRegistryBuilder.register(DynamicStrategyRegistry.class, spawnStrategyRegistry);
     actionContextRegistryBuilder.register(RemoteLocalFallbackRegistry.class, spawnStrategyRegistry);
 
-    ModuleActionContextRegistry moduleActionContextRegistry = actionContextRegistryBuilder.build();
-
-    this.actionContextRegistry = moduleActionContextRegistry;
+    this.actionContextRegistry = actionContextRegistryBuilder.build();
     this.spawnStrategyRegistry = spawnStrategyRegistry;
   }
 
@@ -336,7 +335,7 @@ void executeBuild(
               actionGraph,
               // If this supplier is ever consumed by more than one ActionContextProvider, it can be
               // pulled out of the loop and made a memoizing supplier.
-              () -> TopLevelArtifactHelper.makeTopLevelArtifactsToOwnerLabels(analysisResult));
+              () -> TopLevelArtifactHelper.findAllTopLevelArtifacts(analysisResult));
         }
       }
       skyframeExecutor.drainChangedFiles();
@@ -347,12 +346,10 @@ void executeBuild(
 
       Profiler.instance().markPhase(ProfilePhase.EXECUTE);
       boolean shouldTrustRemoteArtifacts =
-          env.getOutputService() == null
-              ? false
-              : env.getOutputService().shouldTrustRemoteArtifacts();
+          env.getOutputService() != null && env.getOutputService().shouldTrustRemoteArtifacts();
       builder.buildArtifacts(
           env.getReporter(),
-          analysisResult.getTopLevelArtifactsToOwnerLabels().getArtifacts(),
+          analysisResult.getArtifactsToBuild(),
           analysisResult.getParallelTests(),
           analysisResult.getExclusiveTests(),
           analysisResult.getTargetsToBuild(),
@@ -598,7 +595,7 @@ private ImmutableList<ConvenienceSymlink> createConvenienceSymlinks(
         buildRequestOptions.useTopLevelTargetsForSymlinks()
             ? analysisResult.getTargetsToBuild().stream()
                 .map(ConfiguredTarget::getConfigurationKey)
-                .filter(configuration -> configuration != null)
+                .filter(Objects::nonNull)
                 .distinct()
                 .map((key) -> executor.getConfiguration(reporter, key))
                 .collect(toImmutableSet())
@@ -713,7 +710,7 @@ public void handle(Event event) {
    *
    * @param configuredTargets The configured targets whose artifacts are to be built.
    */
-  private Collection<ConfiguredTarget> determineSuccessfulTargets(
+  private static Collection<ConfiguredTarget> determineSuccessfulTargets(
       Collection<ConfiguredTarget> configuredTargets, Set<ConfiguredTargetKey> builtTargets) {
     // Maintain the ordering by copying builtTargets into a LinkedHashSet in the same iteration
     // order as configuredTargets.
diff --git a/src/main/java/com/google/devtools/build/lib/exec/BUILD b/src/main/java/com/google/devtools/build/lib/exec/BUILD
index 0a85847ea19f48..6156860b73767e 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/exec/BUILD
@@ -123,7 +123,7 @@ java_library(
     srcs = ["ExecutorLifecycleListener.java"],
     deps = [
         "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/java/com/google/devtools/build/lib/analysis:artifacts_to_owner_labels",
+        "//src/main/java/com/google/devtools/build/lib/actions:artifacts",
         "//src/main/java/com/google/devtools/build/lib/util:abrupt_exit_exception",
         "//third_party:guava",
     ],
diff --git a/src/main/java/com/google/devtools/build/lib/exec/ExecutorLifecycleListener.java b/src/main/java/com/google/devtools/build/lib/exec/ExecutorLifecycleListener.java
index 14dc308126ec12..0e50691bdc0097 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/ExecutorLifecycleListener.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/ExecutorLifecycleListener.java
@@ -13,10 +13,11 @@
 // limitations under the License.
 package com.google.devtools.build.lib.exec;
 
-import com.google.common.base.Supplier;
+import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.actions.ActionGraph;
-import com.google.devtools.build.lib.analysis.ArtifactsToOwnerLabels;
+import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.util.AbruptExitException;
+import java.util.function.Supplier;
 
 /**
  * Type that can get informed about executor lifecycle events.
@@ -38,11 +39,10 @@ public interface ExecutorLifecycleListener {
    * Handles the start of the execution phase.
    *
    * @param actionGraph actions as calcuated in the analysis phase
-   * @param topLevelArtifactsToOwnerLabels supplier of all output artifacts from top-level targets
-   *     and aspects, mapped to their owners
+   * @param topLevelArtifacts supplies all output artifacts from top-level targets and aspects
    */
   void executionPhaseStarting(
-      ActionGraph actionGraph, Supplier<ArtifactsToOwnerLabels> topLevelArtifactsToOwnerLabels)
+      ActionGraph actionGraph, Supplier<ImmutableSet<Artifact>> topLevelArtifacts)
       throws AbruptExitException, InterruptedException;
 
   /** Handles the end of the execution phase. */
diff --git a/src/main/java/com/google/devtools/build/lib/includescanning/BUILD b/src/main/java/com/google/devtools/build/lib/includescanning/BUILD
index 2bf6673792bd12..f5dce07a1a9d4b 100644
--- a/src/main/java/com/google/devtools/build/lib/includescanning/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/includescanning/BUILD
@@ -21,7 +21,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions:file_metadata",
         "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
         "//src/main/java/com/google/devtools/build/lib/actions:middleman_type",
-        "//src/main/java/com/google/devtools/build/lib/analysis:artifacts_to_owner_labels",
         "//src/main/java/com/google/devtools/build/lib/analysis:blaze_directories",
         "//src/main/java/com/google/devtools/build/lib/analysis/platform",
         "//src/main/java/com/google/devtools/build/lib/cmdline",
@@ -43,7 +42,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
         "//src/main/java/com/google/devtools/build/lib/util:abrupt_exit_exception",
         "//src/main/java/com/google/devtools/build/lib/util:detailed_exit_code",
-        "//src/main/java/com/google/devtools/build/lib/util:exit_code",
         "//src/main/java/com/google/devtools/build/lib/util:resource_converter",
         "//src/main/java/com/google/devtools/build/lib/util/io",
         "//src/main/java/com/google/devtools/build/lib/vfs",
diff --git a/src/main/java/com/google/devtools/build/lib/includescanning/IncludeScannerSupplier.java b/src/main/java/com/google/devtools/build/lib/includescanning/IncludeScannerSupplier.java
index dd56ff4d416e50..729825ba13ac18 100644
--- a/src/main/java/com/google/devtools/build/lib/includescanning/IncludeScannerSupplier.java
+++ b/src/main/java/com/google/devtools/build/lib/includescanning/IncludeScannerSupplier.java
@@ -14,7 +14,6 @@
 package com.google.devtools.build.lib.includescanning;
 
 import com.google.common.base.Preconditions;
-import com.google.common.base.Supplier;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -32,6 +31,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
 
 /**
  * Creates include scanner instances.
diff --git a/src/main/java/com/google/devtools/build/lib/includescanning/IncludeScanningModule.java b/src/main/java/com/google/devtools/build/lib/includescanning/IncludeScanningModule.java
index f0e5ec3b69db3d..7b251405a07965 100644
--- a/src/main/java/com/google/devtools/build/lib/includescanning/IncludeScanningModule.java
+++ b/src/main/java/com/google/devtools/build/lib/includescanning/IncludeScanningModule.java
@@ -14,7 +14,6 @@
 package com.google.devtools.build.lib.includescanning;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -29,7 +28,6 @@
 import com.google.devtools.build.lib.actions.ArtifactFactory;
 import com.google.devtools.build.lib.actions.ArtifactResolver;
 import com.google.devtools.build.lib.actions.ExecException;
-import com.google.devtools.build.lib.analysis.ArtifactsToOwnerLabels;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.buildtool.BuildRequest;
 import com.google.devtools.build.lib.concurrent.ExecutorUtil;
@@ -63,6 +61,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
 
 /**
  * Module that provides implementations of {@link CppIncludeExtractionContext},
@@ -111,7 +110,7 @@ public void executorInit(CommandEnvironment env, BuildRequest request, ExecutorB
   public Iterable<Class<? extends OptionsBase>> getCommandOptions(Command command) {
     return "build".equals(command.name())
         ? ImmutableList.of(IncludeScanningOptions.class)
-        : ImmutableList.<Class<? extends OptionsBase>>of();
+        : ImmutableList.of();
   }
 
   @Override
@@ -219,7 +218,7 @@ public void extractSwigIncludes(
    * supplier} which can be used to access the (potentially shared) scanners and exposes {@linkplain
    * #getSwigActionContext() action} {@linkplain #getCppActionContext() contexts} based on them.
    */
-  private static class IncludeScannerLifecycleManager implements ExecutorLifecycleListener {
+  private static final class IncludeScannerLifecycleManager implements ExecutorLifecycleListener {
     private final CommandEnvironment env;
     private final BuildRequest buildRequest;
 
@@ -227,7 +226,7 @@ private static class IncludeScannerLifecycleManager implements ExecutorLifecycle
     private IncludeScannerSupplier includeScannerSupplier;
     private ExecutorService includePool;
 
-    public IncludeScannerLifecycleManager(
+    IncludeScannerLifecycleManager(
         CommandEnvironment env,
         BuildRequest buildRequest,
         MutableSupplier<SpawnIncludeScanner> spawnScannerSupplier) {
@@ -254,8 +253,7 @@ private SwigIncludeScanningContextImpl getSwigActionContext() {
 
     @Override
     public void executionPhaseStarting(
-        ActionGraph actionGraph,
-        Supplier<ArtifactsToOwnerLabels> topLevelArtifactsToAccountingGroups)
+        ActionGraph actionGraph, Supplier<ImmutableSet<Artifact>> topLevelArtifacts)
         throws AbruptExitException, InterruptedException {
       try {
         includeScannerSupplier.init(
diff --git a/src/main/java/com/google/devtools/build/lib/includescanning/LegacyIncludeScanner.java b/src/main/java/com/google/devtools/build/lib/includescanning/LegacyIncludeScanner.java
index 51d77403328fb2..1aeb9c61aaf24c 100644
--- a/src/main/java/com/google/devtools/build/lib/includescanning/LegacyIncludeScanner.java
+++ b/src/main/java/com/google/devtools/build/lib/includescanning/LegacyIncludeScanner.java
@@ -14,7 +14,6 @@
 package com.google.devtools.build.lib.includescanning;
 
 import com.google.common.base.Preconditions;
-import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
@@ -55,6 +54,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
+import java.util.function.Supplier;
 
 /**
  * C include scanner. Quickly scans C/C++ source files to determine the bounding set of transitively
@@ -254,7 +254,7 @@ private LocateOnPathResult locateOnFrameworkPaths(
         }
 
         // Look for header in path/to/foo.framework/Headers/
-        PathFragment foundHeaderPath = null;
+        PathFragment foundHeaderPath;
         PathFragment fullHeaderPath =
             fullFrameworkPath.getRelative("Headers").getRelative(relHeaderPath);
 
@@ -938,10 +938,10 @@ private void processFileLevelHintsAsync(
     }
   }
 
-  private static class ExecRuntimeException extends RuntimeException {
+  private static final class ExecRuntimeException extends RuntimeException {
     private final ExecException cause;
 
-    public ExecRuntimeException(ExecException e) {
+    ExecRuntimeException(ExecException e) {
       super(e);
       this.cause = e;
     }
@@ -951,10 +951,10 @@ public ExecException getRealCause() {
     }
   }
 
-  private static class InterruptedRuntimeException extends RuntimeException {
+  private static final class InterruptedRuntimeException extends RuntimeException {
     private final InterruptedException cause;
 
-    public InterruptedRuntimeException(InterruptedException e) {
+    InterruptedRuntimeException(InterruptedException e) {
       super(e);
       this.cause = e;
     }
diff --git a/src/main/java/com/google/devtools/build/lib/remote/BUILD b/src/main/java/com/google/devtools/build/lib/remote/BUILD
index ad5159da2b8631..56bbf5dce7f9b1 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/remote/BUILD
@@ -48,7 +48,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions:file_metadata",
         "//src/main/java/com/google/devtools/build/lib/actions:fileset_output_symlink",
         "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
-        "//src/main/java/com/google/devtools/build/lib/analysis:artifacts_to_owner_labels",
         "//src/main/java/com/google/devtools/build/lib/analysis:config/build_options",
         "//src/main/java/com/google/devtools/build/lib/analysis:configured_target",
         "//src/main/java/com/google/devtools/build/lib/analysis:top_level_artifact_context",
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java
index c1f8462f077f34..be7de3c267d7c8 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java
@@ -16,12 +16,11 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.base.Preconditions;
-import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListeningScheduledExecutorService;
 import com.google.devtools.build.lib.actions.ActionGraph;
 import com.google.devtools.build.lib.actions.ActionInput;
-import com.google.devtools.build.lib.analysis.ArtifactsToOwnerLabels;
+import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.exec.ExecutionOptions;
 import com.google.devtools.build.lib.exec.ExecutorLifecycleListener;
 import com.google.devtools.build.lib.exec.ModuleActionContextRegistry;
@@ -36,9 +35,10 @@
 import com.google.devtools.build.lib.remote.util.DigestUtil;
 import com.google.devtools.build.lib.runtime.CommandEnvironment;
 import com.google.devtools.build.lib.vfs.Path;
+import java.util.function.Supplier;
 import javax.annotation.Nullable;
 
-/** Provide a remote execution context. */
+/** Provides a remote execution context. */
 final class RemoteActionContextProvider implements ExecutorLifecycleListener {
 
   private final CommandEnvironment env;
@@ -85,7 +85,7 @@ public static RemoteActionContextProvider createForRemoteExecution(
         env, cache, executor, retryScheduler, digestUtil, logDir);
   }
 
-  RemotePathResolver createRemotePathResolver() {
+  private RemotePathResolver createRemotePathResolver() {
     Path execRoot = env.getExecRoot();
     BuildLanguageOptions buildLanguageOptions =
         env.getOptions().getOptions(BuildLanguageOptions.class);
@@ -101,7 +101,7 @@ RemotePathResolver createRemotePathResolver() {
     return remotePathResolver;
   }
 
-  RemoteExecutionService getRemoteExecutionService() {
+  private RemoteExecutionService getRemoteExecutionService() {
     if (remoteExecutionService == null) {
       remoteExecutionService =
           new RemoteExecutionService(
@@ -177,7 +177,7 @@ public void executorCreated() {}
 
   @Override
   public void executionPhaseStarting(
-      ActionGraph actionGraph, Supplier<ArtifactsToOwnerLabels> topLevelArtifactsToOwnerLabels) {}
+      ActionGraph actionGraph, Supplier<ImmutableSet<Artifact>> topLevelArtifacts) {}
 
   @Override
   public void executionPhaseEnding() {
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/ArtifactsToOwnerLabelsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/ArtifactsToOwnerLabelsTest.java
deleted file mode 100644
index 6f3bebca0a6d3d..00000000000000
--- a/src/test/java/com/google/devtools/build/lib/analysis/ArtifactsToOwnerLabelsTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2018 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.devtools.build.lib.analysis;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.cmdline.Label;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mockito;
-
-/** Tests for {@link ArtifactsToOwnerLabels}. */
-@RunWith(JUnit4.class)
-public class ArtifactsToOwnerLabelsTest {
-  @Test
-  public void smoke() {
-    Artifact label1Artifact = Mockito.mock(Artifact.class);
-    Label label1 = Label.parseAbsoluteUnchecked("//label:one");
-    Mockito.when(label1Artifact.getOwnerLabel()).thenReturn(label1);
-    ArtifactsToOwnerLabels underTest =
-        new ArtifactsToOwnerLabels.Builder().addArtifact(label1Artifact).build();
-    assertThat(underTest.getOwners(label1Artifact)).containsExactly(label1);
-    underTest = new ArtifactsToOwnerLabels.Builder().addArtifact(label1Artifact, label1).build();
-    assertThat(underTest.getOwners(label1Artifact)).containsExactly(label1);
-    underTest =
-        new ArtifactsToOwnerLabels.Builder()
-            .addArtifact(label1Artifact)
-            .addArtifact(label1Artifact, label1)
-            .build();
-    assertThat(underTest.getOwners(label1Artifact)).containsExactly(label1);
-    underTest =
-        new ArtifactsToOwnerLabels.Builder()
-            .addArtifact(label1Artifact, label1)
-            .addArtifact(label1Artifact)
-            .build();
-    assertThat(underTest.getOwners(label1Artifact)).containsExactly(label1);
-    Label label2 = Label.parseAbsoluteUnchecked("//label:two");
-    underTest =
-        new ArtifactsToOwnerLabels.Builder()
-            .addArtifact(label1Artifact, label2)
-            .addArtifact(label1Artifact)
-            .build();
-    assertThat(underTest.getOwners(label1Artifact)).containsExactly(label1, label2);
-    underTest =
-        new ArtifactsToOwnerLabels.Builder()
-            .addArtifact(label1Artifact)
-            .addArtifact(label1Artifact, label2)
-            .build();
-    assertThat(underTest.getOwners(label1Artifact)).containsExactly(label1, label2);
-  }
-}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
index deaf3638ca0625..a1f9d2a6fe1c23 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
@@ -64,7 +64,7 @@
 public class AspectTest extends AnalysisTestCase {
 
   private void pkg(String name, String... contents) throws Exception {
-    scratch.file("" + name + "/BUILD", contents);
+    scratch.file(name + "/BUILD", contents);
   }
 
   @Test
@@ -628,7 +628,7 @@ public void extraActionsAreEmitted_topLevel() throws Exception {
 
       // Get owners of all extra-action artifacts.
       List<Label> extraArtifactOwners = new ArrayList<>();
-      for (Artifact artifact : analysisResult.getTopLevelArtifactsToOwnerLabels().getArtifacts()) {
+      for (Artifact artifact : analysisResult.getArtifactsToBuild()) {
         if (artifact.getRootRelativePathString().endsWith(".xa")) {
           extraArtifactOwners.add(artifact.getOwnerLabel());
         }
@@ -642,7 +642,7 @@ public void extraActionsAreEmitted_topLevel() throws Exception {
 
       // Get owners of all extra-action artifacts.
       List<Label> extraArtifactOwners = new ArrayList<>();
-      for (Artifact artifact : analysisResult.getTopLevelArtifactsToOwnerLabels().getArtifacts()) {
+      for (Artifact artifact : analysisResult.getArtifactsToBuild()) {
         if (artifact.getRootRelativePathString().endsWith(".xa")) {
           extraArtifactOwners.add(artifact.getOwnerLabel());
         }
@@ -841,9 +841,7 @@ public void aspectTruthInAdvertisement() throws Exception {
   @Test
   public void aspectApplyingToFiles() throws Exception {
     AspectApplyingToFiles aspectApplyingToFiles = new AspectApplyingToFiles();
-    setRulesAndAspectsAvailableInTests(
-        ImmutableList.<NativeAspectClass>of(aspectApplyingToFiles),
-        ImmutableList.<RuleDefinition>of());
+    setRulesAndAspectsAvailableInTests(ImmutableList.of(aspectApplyingToFiles), ImmutableList.of());
     pkg(
         "a",
         "java_binary(name = 'x', main_class = 'x.FooBar', srcs = ['x.java'])"
@@ -861,9 +859,7 @@ public void aspectApplyingToFiles() throws Exception {
   @Test
   public void aspectApplyingToSourceFilesIgnored() throws Exception {
     AspectApplyingToFiles aspectApplyingToFiles = new AspectApplyingToFiles();
-    setRulesAndAspectsAvailableInTests(
-        ImmutableList.<NativeAspectClass>of(aspectApplyingToFiles),
-        ImmutableList.<RuleDefinition>of());
+    setRulesAndAspectsAvailableInTests(ImmutableList.of(aspectApplyingToFiles), ImmutableList.of());
     pkg(
         "a",
         "java_binary(name = 'x', main_class = 'x.FooBar', srcs = ['x.java'])"
@@ -879,9 +875,7 @@ public void aspectApplyingToSourceFilesIgnored() throws Exception {
   @Test
   public void duplicateAspectsDeduped() throws Exception {
     AspectApplyingToFiles aspectApplyingToFiles = new AspectApplyingToFiles();
-    setRulesAndAspectsAvailableInTests(
-        ImmutableList.<NativeAspectClass>of(aspectApplyingToFiles),
-        ImmutableList.<RuleDefinition>of());
+    setRulesAndAspectsAvailableInTests(ImmutableList.of(aspectApplyingToFiles), ImmutableList.of());
     pkg("a", "java_binary(name = 'x', main_class = 'x.FooBar', srcs = ['x.java'])");
     AnalysisResult analysisResult =
         update(
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BUILD b/src/test/java/com/google/devtools/build/lib/analysis/BUILD
index b287c025b9ee93..1bfe049fc3aa05 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BUILD
@@ -55,7 +55,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/analysis:actions/template",
         "//src/main/java/com/google/devtools/build/lib/analysis:actions/template_expansion_action",
         "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
-        "//src/main/java/com/google/devtools/build/lib/analysis:artifacts_to_owner_labels",
         "//src/main/java/com/google/devtools/build/lib/analysis:aspect_aware_attribute_mapper",
         "//src/main/java/com/google/devtools/build/lib/analysis:aspect_collection",
         "//src/main/java/com/google/devtools/build/lib/analysis:blaze_directories",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index 77bd10bd9f21f8..36928177c17ce8 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -1300,7 +1300,7 @@ public void ruleExtraActionsDontHideAspectExtraActions() throws Exception {
     AnalysisResult analysisResult = update("//x:a");
 
     List<String> owners = new ArrayList<>();
-    for (Artifact artifact : analysisResult.getTopLevelArtifactsToOwnerLabels().getArtifacts()) {
+    for (Artifact artifact : analysisResult.getArtifactsToBuild()) {
       if ("xa".equals(artifact.getExtension())) {
         owners.add(artifact.getOwnerLabel().toString());
       }
diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/BUILD b/src/test/java/com/google/devtools/build/lib/buildtool/BUILD
index 7dd46cf6d457cc..1c14e9b561591d 100644
--- a/src/test/java/com/google/devtools/build/lib/buildtool/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/buildtool/BUILD
@@ -145,7 +145,7 @@ java_test(
     deps = [
         "//src/main/java/com/google/devtools/build/lib:runtime",
         "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/java/com/google/devtools/build/lib/analysis:artifacts_to_owner_labels",
+        "//src/main/java/com/google/devtools/build/lib/actions:artifacts",
         "//src/main/java/com/google/devtools/build/lib/exec:executor_builder",
         "//src/main/java/com/google/devtools/build/lib/exec:executor_lifecycle_listener",
         "//src/main/java/com/google/devtools/build/lib/util:abrupt_exit_exception",
diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/ContextProviderInitializationTest.java b/src/test/java/com/google/devtools/build/lib/buildtool/ContextProviderInitializationTest.java
index 383314eeae69fd..83c6f8c35b895b 100644
--- a/src/test/java/com/google/devtools/build/lib/buildtool/ContextProviderInitializationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/buildtool/ContextProviderInitializationTest.java
@@ -15,10 +15,10 @@
 
 import static org.junit.Assert.assertThrows;
 
-import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.actions.ActionGraph;
-import com.google.devtools.build.lib.analysis.ArtifactsToOwnerLabels;
+import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.buildtool.util.BuildIntegrationTestCase;
 import com.google.devtools.build.lib.exec.ExecutorBuilder;
 import com.google.devtools.build.lib.exec.ExecutorLifecycleListener;
@@ -30,10 +30,12 @@
 import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
 import com.google.devtools.build.lib.util.AbruptExitException;
 import com.google.devtools.build.lib.util.DetailedExitCode;
+import java.util.function.Supplier;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
+
 /**
  * Test to make sure that context provider initialization failure is handled correctly.
  */
@@ -51,8 +53,7 @@ public void executorCreated() {}
 
             @Override
             public void executionPhaseStarting(
-                ActionGraph actionGraph,
-                Supplier<ArtifactsToOwnerLabels> topLevelArtifactsToAccountingGroups)
+                ActionGraph actionGraph, Supplier<ImmutableSet<Artifact>> topLevelArtifacts)
                 throws AbruptExitException {
               throw new AbruptExitException(
                   DetailedExitCode.of(
@@ -75,7 +76,7 @@ protected BlazeRuntime.Builder getRuntimeBuilder() throws Exception {
   }
 
   @Test
-  public void testContextProviderInitializationFailure() throws Exception {
+  public void testContextProviderInitializationFailure() {
     assertThrows(AbruptExitException.class, () -> runtimeWrapper.executeBuild(ImmutableList.of()));
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java
index 7476aad30b159a..92800aebec496a 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java
@@ -166,7 +166,7 @@ public void aspectWithDeclaredProvidersInAStruct() throws Exception {
     assertThat(configuredAspect.get(barKey).getProvider().getKey()).isEqualTo(barKey);
   }
 
-  private Iterable<String> getAspectDescriptions(AnalysisResult analysisResult) {
+  private static Iterable<String> getAspectDescriptions(AnalysisResult analysisResult) {
     return Iterables.transform(
         analysisResult.getAspectsMap().keySet(),
         aspectKey ->
@@ -214,7 +214,7 @@ public void aspectCommandLineRepoLabel() throws Exception {
         .containsExactly("@local//:aspect.bzl%MyAspect(//test:xxx)");
   }
 
-  private Iterable<String> getLabelsToBuild(AnalysisResult analysisResult) {
+  private static Iterable<String> getLabelsToBuild(AnalysisResult analysisResult) {
     return Iterables.transform(
         analysisResult.getTargetsToBuild(),
         configuredTarget -> configuredTarget.getLabel().toString());
@@ -1219,7 +1219,7 @@ public void aspectParametersUncovered() throws Exception {
 
     reporter.removeHandler(failFastHandler);
     try {
-      AnalysisResult result = update(ImmutableList.<String>of(), "//test:xxx");
+      AnalysisResult result = update(ImmutableList.of(), "//test:xxx");
       assertThat(keepGoing()).isTrue();
       assertThat(result.hasError()).isTrue();
     } catch (Exception e) {
@@ -1252,7 +1252,7 @@ public void aspectParametersTypeMismatch() throws Exception {
 
     reporter.removeHandler(failFastHandler);
     try {
-      AnalysisResult result = update(ImmutableList.<String>of(), "//test:xxx");
+      AnalysisResult result = update(ImmutableList.of(), "//test:xxx");
       assertThat(keepGoing()).isTrue();
       assertThat(result.hasError()).isTrue();
     } catch (Exception e) {
@@ -1287,7 +1287,7 @@ public void aspectParametersDontSupportSelect() throws Exception {
 
     reporter.removeHandler(failFastHandler);
     try {
-      AnalysisResult result = update(ImmutableList.<String>of(), "//test:xxx");
+      AnalysisResult result = update(ImmutableList.of(), "//test:xxx");
       assertThat(keepGoing()).isTrue();
       assertThat(result.hasError()).isTrue();
     } catch (Exception e) {
@@ -1319,7 +1319,7 @@ public void aspectParametersBadDefault() throws Exception {
 
     reporter.removeHandler(failFastHandler);
     try {
-      AnalysisResult result = update(ImmutableList.<String>of(), "//test:xxx");
+      AnalysisResult result = update(ImmutableList.of(), "//test:xxx");
       assertThat(keepGoing()).isTrue();
       assertThat(result.hasError()).isTrue();
     } catch (Exception e) {
@@ -1357,7 +1357,7 @@ public void aspectParametersBadValue() throws Exception {
 
     reporter.removeHandler(failFastHandler);
     try {
-      AnalysisResult result = update(ImmutableList.<String>of(), "//test:xxx");
+      AnalysisResult result = update(ImmutableList.of(), "//test:xxx");
       assertThat(keepGoing()).isTrue();
       assertThat(result.hasError()).isTrue();
     } catch (Exception e) {
@@ -1390,7 +1390,7 @@ public void aspectParameters() throws Exception {
         "load('//test:aspect.bzl', 'my_rule')",
         "my_rule(name = 'xxx', my_attr = 'aaa')");
 
-    AnalysisResult result = update(ImmutableList.<String>of(), "//test:xxx");
+    AnalysisResult result = update(ImmutableList.of(), "//test:xxx");
     assertThat(result.hasError()).isFalse();
   }
 
@@ -1413,7 +1413,7 @@ public void aspectParametersConfigurationField() throws Exception {
         ")");
     scratch.file("test/BUILD", "load('//test:aspect.bzl', 'my_rule')", "my_rule(name = 'xxx')");
 
-    AnalysisResult result = update(ImmutableList.<String>of(), "//test:xxx");
+    AnalysisResult result = update(ImmutableList.of(), "//test:xxx");
     assertThat(result.hasError()).isFalse();
   }
 
@@ -1466,7 +1466,7 @@ public void aspectParametersOptional() throws Exception {
         ")");
     scratch.file("test/BUILD", "load('//test:aspect.bzl', 'my_rule')", "my_rule(name = 'xxx')");
 
-    AnalysisResult result = update(ImmutableList.<String>of(), "//test:xxx");
+    AnalysisResult result = update(ImmutableList.of(), "//test:xxx");
     assertThat(result.hasError()).isFalse();
   }
 
@@ -1494,7 +1494,7 @@ public void aspectParametersOptionalOverride() throws Exception {
         "load('//test:aspect.bzl', 'my_rule')",
         "my_rule(name = 'xxx', my_attr = 'b')");
 
-    AnalysisResult result = update(ImmutableList.<String>of(), "//test:xxx");
+    AnalysisResult result = update(ImmutableList.of(), "//test:xxx");
     assertThat(result.hasError()).isFalse();
   }
 
@@ -1519,35 +1519,35 @@ public void testMultipleExecutablesInTarget() throws Exception {
         "foo/BUILD",
         "load(':extension.bzl',  'my_rule')",
         "my_rule(name = 'main', exe1 = ':tool.sh', exe2 = ':tool.sh')");
-    AnalysisResult analysisResultOfRule = update(ImmutableList.<String>of(), "//foo:main");
+    AnalysisResult analysisResultOfRule = update(ImmutableList.of(), "//foo:main");
     assertThat(analysisResultOfRule.hasError()).isFalse();
 
     AnalysisResult analysisResultOfAspect =
-        update(ImmutableList.<String>of("/foo/extension.bzl%my_aspect"), "//foo:main");
+        update(ImmutableList.of("/foo/extension.bzl%my_aspect"), "//foo:main");
     assertThat(analysisResultOfAspect.hasError()).isFalse();
   }
 
   @Test
   public void aspectFragmentAccessSuccess() throws Exception {
-    getConfiguredTargetForAspectFragment(
+    analyzeConfiguredTargetForAspectFragment(
         "ctx.fragments.java.strict_java_deps", "'java'", "", "", "");
     assertNoEvents();
   }
 
   @Test
   public void aspectHostFragmentAccessSuccess() throws Exception {
-    getConfiguredTargetForAspectFragment(
+    analyzeConfiguredTargetForAspectFragment(
         "ctx.host_fragments.java.strict_java_deps", "", "'java'", "", "");
     assertNoEvents();
   }
 
   @Test
-  public void aspectFragmentAccessError() throws Exception {
+  public void aspectFragmentAccessError() {
     reporter.removeHandler(failFastHandler);
     assertThrows(
         ViewCreationFailedException.class,
         () ->
-            getConfiguredTargetForAspectFragment(
+            analyzeConfiguredTargetForAspectFragment(
                 "ctx.fragments.java.strict_java_deps", "'cpp'", "'java'", "'java'", ""));
     assertContainsEvent(
         "//test:aspect.bzl%MyAspect aspect on my_rule has to declare 'java' as a "
@@ -1557,12 +1557,12 @@ public void aspectFragmentAccessError() throws Exception {
   }
 
   @Test
-  public void aspectHostFragmentAccessError() throws Exception {
+  public void aspectHostFragmentAccessError() {
     reporter.removeHandler(failFastHandler);
     assertThrows(
         ViewCreationFailedException.class,
         () ->
-            getConfiguredTargetForAspectFragment(
+            analyzeConfiguredTargetForAspectFragment(
                 "ctx.host_fragments.java.java_strict_deps", "'java'", "'cpp'", "", "'java'"));
     assertContainsEvent(
         "//test:aspect.bzl%MyAspect aspect on my_rule has to declare 'java' as a "
@@ -1571,7 +1571,7 @@ public void aspectHostFragmentAccessError() throws Exception {
             + "(for example: host_fragments = [\"java\"])");
   }
 
-  private ConfiguredTarget getConfiguredTargetForAspectFragment(
+  private void analyzeConfiguredTargetForAspectFragment(
       String fullFieldName,
       String fragments,
       String hostFragments,
@@ -1624,7 +1624,7 @@ private ConfiguredTarget getConfiguredTargetForAspectFragment(
               .build());
     }
 
-    return getConfiguredTarget("//test:xxx");
+    assertThat(getConfiguredTarget("//test:xxx")).isNotNull();
   }
 
   @Test
@@ -1646,14 +1646,14 @@ public void invalidateAspectOnBzlFileChange() throws Exception {
   }
 
   private void buildTargetAndCheckRuleInfo(String... expectedLabels) throws Exception {
-    AnalysisResult result = update(ImmutableList.<String>of(), "//test:r2");
+    AnalysisResult result = update(ImmutableList.of(), "//test:r2");
     ConfiguredTarget configuredTarget = result.getTargetsToBuild().iterator().next();
     Depset ruleInfoValue = (Depset) configuredTarget.get("rule_info");
     assertThat(ruleInfoValue.getSet(String.class).toList())
         .containsExactlyElementsIn(expectedLabels);
   }
 
-  private String[] aspectBzlFile(String attrAspects) {
+  private static String[] aspectBzlFile(String attrAspects) {
     return new String[] {
       "def _repro_aspect_impl(target, ctx):",
       "    s = depset([str(target.label)], transitive =",
@@ -1718,7 +1718,7 @@ public void aspectOutputsToBinDirectory() throws Exception {
         "rule_bin_out(name = 'rbin')",
         "rule_gen_out(name = 'rgen')",
         "main_rule(name = 'main', deps = [':rbin', ':rgen'])");
-    AnalysisResult analysisResult = update(ImmutableList.<String>of(), "//foo:main");
+    AnalysisResult analysisResult = update(ImmutableList.of(), "//foo:main");
     ConfiguredTarget target = analysisResult.getTargetsToBuild().iterator().next();
     NestedSet<Artifact> aspectFiles = ((Depset) target.get("aspect_files")).getSet(Artifact.class);
     assertThat(Iterables.transform(aspectFiles.toList(), Artifact::getFilename))
@@ -1823,11 +1823,8 @@ public void topLevelAspectsAndExtraActions() throws Exception {
         "java_library(name = 'xxx')");
     useConfiguration("--experimental_action_listener=//test:al");
     AnalysisResult analysisResult =
-        update(ImmutableList.<String>of("test/aspect.bzl%my_aspect"), "//test:xxx");
-    assertThat(
-            Iterables.transform(
-                analysisResult.getTopLevelArtifactsToOwnerLabels().getArtifacts(),
-                Artifact::getFilename))
+        update(ImmutableList.of("test/aspect.bzl%my_aspect"), "//test:xxx");
+    assertThat(Iterables.transform(analysisResult.getArtifactsToBuild(), Artifact::getFilename))
         .contains("file.xa");
   }
 
@@ -1950,7 +1947,7 @@ public void aspectOnAspectLinear() throws Exception {
         "r2(name = 'r2', dep = ':r1')");
     AnalysisResult analysisResult = update("//test:r2");
     ConfiguredTarget target = Iterables.getOnlyElement(analysisResult.getTargetsToBuild());
-    Sequence<?> result = (Sequence) target.get("result");
+    Sequence<?> result = (Sequence<?>) target.get("result");
 
     // "yes" means that aspect a2 sees a1's providers.
     assertThat(result)
@@ -2014,7 +2011,7 @@ public void aspectOnAspectDiamond() throws Exception {
         "rcollect(name = 'rcollect', deps = [':r1', ':r2'])");
     AnalysisResult analysisResult = update("//test:rcollect");
     ConfiguredTarget target = Iterables.getOnlyElement(analysisResult.getTargetsToBuild());
-    Sequence<?> result = (Sequence) target.get("result");
+    Sequence<?> result = (Sequence<?>) target.get("result");
     assertThat(result)
         .containsExactly(
             "//test:r0[\"//test:aspect.bzl%a1\", \"//test:aspect.bzl%a3\"]=a1p",
@@ -2064,7 +2061,7 @@ public void aspectOnAspectLinearDuplicates() throws Exception {
         "r2(name = 'r2', dep = ':r1')");
     AnalysisResult analysisResult = update("//test:r2");
     ConfiguredTarget target = Iterables.getOnlyElement(analysisResult.getTargetsToBuild());
-    Sequence<?> result = (Sequence) target.get("result");
+    Sequence<?> result = (Sequence<?>) target.get("result");
     // "yes" means that aspect a2 sees a1's providers.
     assertThat(result)
         .containsExactly(