diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
3 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java index eb559ea81e..70b8e51967 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java @@ -27,6 +27,7 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.events.ExtendedEventHandler; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.skyframe.SkyFunction; +import java.util.List; /** * The set of services that are provided to {@link ConfiguredTarget} objects @@ -106,7 +107,7 @@ public interface AnalysisEnvironment extends ActionRegistry { * Returns the actions that were registered so far with this analysis environment, that is, all * the actions that were created by the current target being analyzed. */ - Iterable<ActionAnalysisMetadata> getRegisteredActions(); + List<ActionAnalysisMetadata> getRegisteredActions(); /** * Returns the Skyframe SkyFunction.Environment if available. Otherwise, null. 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 c9709ab4ef..7c18968f6b 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 @@ -31,6 +31,7 @@ import com.google.common.collect.Sets; import com.google.common.eventbus.EventBus; import com.google.devtools.build.lib.actions.ActionAnalysisMetadata; import com.google.devtools.build.lib.actions.ActionGraph; +import com.google.devtools.build.lib.actions.ActionLookupValue; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ArtifactFactory; import com.google.devtools.build.lib.actions.ArtifactOwner; @@ -71,7 +72,6 @@ import com.google.devtools.build.lib.pkgcache.LoadingResult; import com.google.devtools.build.lib.rules.test.CoverageReportActionFactory; import com.google.devtools.build.lib.rules.test.CoverageReportActionFactory.CoverageReportActionsWrapper; import com.google.devtools.build.lib.rules.test.InstrumentedFilesProvider; -import com.google.devtools.build.lib.skyframe.ActionLookupValue; import com.google.devtools.build.lib.skyframe.AspectValue; import com.google.devtools.build.lib.skyframe.AspectValue.AspectKey; import com.google.devtools.build.lib.skyframe.AspectValue.AspectValueKey; @@ -641,7 +641,7 @@ public class BuildView { throw new IllegalStateException( "Interruption not expected from this graph: " + key, e); } - return val == null ? null : val.getGeneratingAction(artifact); + return val == null ? null : val.getGeneratingActionDangerousReadJavadoc(artifact); } return null; } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java index 426b00fcf0..ddf5b99fe4 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java @@ -270,8 +270,8 @@ public class CachingAnalysisEnvironment implements AnalysisEnvironment { } @Override - public Collection<ActionAnalysisMetadata> getRegisteredActions() { - return Collections.unmodifiableCollection(actions); + public List<ActionAnalysisMetadata> getRegisteredActions() { + return Collections.unmodifiableList(actions); } @Override |