Clean up analysis error reporting a bit:

1. Make --analysis_warnings_as_errors a no-op.
2. Stop doing a sanity check that we didn't succeed in analysis even with errors emitted.
3. As a result, emit an error about shared actions to the proper listener.

--
MOS_MIGRATED_REVID=92262247

2 files changed, 9 insertions, 31 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
index 59b242f364..d094eba092 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
@@ -78,7 +78,6 @@ public final class SkyframeBuildView {
 
   private final ConfiguredTargetFactory factory;
   private final ArtifactFactory artifactFactory;
-  @Nullable private EventHandler warningListener;
   private final SkyframeExecutor skyframeExecutor;
   private final Runnable legacyDataCleaner;
   private final BinTools binTools;
@@ -109,10 +108,6 @@ public final class SkyframeBuildView {
     skyframeExecutor.setArtifactFactoryAndBinTools(artifactFactory, binTools);
   }
 
-  public void setWarningListener(@Nullable EventHandler warningListener) {
-    this.warningListener = warningListener;
-  }
-
   public void resetEvaluatedConfiguredTargetKeysSet() {
     evaluatedConfiguredTargets.clear();
   }
@@ -249,14 +244,13 @@ public final class SkyframeBuildView {
         } else {
           root = maybeGetConfiguredTargetCycleCulprit(errorInfo.getCycleInfo());
         }
-        if (warningListener != null) {
-          Exception cause = errorInfo.getException();
-          if (cause instanceof ActionConflictException) {
-            ((ActionConflictException) cause).reportTo(warningListener);
-          }
-          warningListener.handle(Event.warn("errors encountered while analyzing target '"
-              + label + "': it will not be built"));
+        Exception cause = errorInfo.getException();
+        if (cause instanceof ActionConflictException) {
+          ((ActionConflictException) cause).reportTo(skyframeExecutor.getReporter());
         }
+        skyframeExecutor.getReporter().handle(
+            Event.warn("errors encountered while analyzing target '"
+                + label + "': it will not be built"));
         eventBus.post(new AnalysisFailureEvent(
             LabelAndConfiguration.of(label.getLabel(), label.getConfiguration()), root));
       }
@@ -269,10 +263,9 @@ public final class SkyframeBuildView {
         ex.rethrowTyped();
       } catch (MutableActionGraph.ActionConflictException ace) {
         ace.reportTo(skyframeExecutor.getReporter());
-        if (warningListener != null) {
-          warningListener.handle(Event.warn("errors encountered while analyzing target '"
-              + bad.getKey().getOwner().getLabel() + "': it will not be built"));
-        }
+        skyframeExecutor.getReporter()
+            .handle(Event.warn("errors encountered while analyzing target '"
+                + bad.getKey().getOwner().getLabel() + "': it will not be built"));
       } catch (ArtifactPrefixConflictException apce) {
         if (reportedExceptions.add(apce)) {
           skyframeExecutor.getReporter().handle(Event.error(apce.getMessage()));
@@ -327,11 +320,6 @@ public final class SkyframeBuildView {
     return artifactFactory;
   }
 
-  @Nullable
-  EventHandler getWarningListener() {
-    return warningListener;
-  }
-
   /**
    * Because we don't know what build-info artifacts this configured target may request, we
    * conservatively register a dep on all of them.
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 6e668aeede..a675bc8623 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -798,9 +798,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
   public void setSkyframeBuildView(SkyframeBuildView skyframeBuildView) {
     this.skyframeBuildView = skyframeBuildView;
     this.artifactFactory.set(skyframeBuildView.getArtifactFactory());
-    if (skyframeBuildView.getWarningListener() != null) {
-      setErrorEventListener(skyframeBuildView.getWarningListener());
-    }
   }
 
   /**
@@ -811,13 +808,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
   }
 
   /**
-   * Sets the eventHandler to use for reporting errors.
-   */
-  public void setErrorEventListener(EventHandler eventHandler) {
-    this.errorEventListener = eventHandler;
-  }
-
-  /**
    * Sets the path for action log buffers.
    */
   public void setActionOutputRoot(Path actionOutputRoot) {