Fix NPE in action graph dump.

RELNOTES: None
PiperOrigin-RevId: 192445971

1 files changed, 13 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
index 066fbcac7f..c900a61300 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
@@ -779,15 +779,19 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
       SkyKey key = skyKeyAndNodeEntry.getKey();
       SkyFunctionName functionName = key.functionName();
       try {
-        if (functionName.equals(SkyFunctions.CONFIGURED_TARGET)) {
-          actionGraphDump.dumpConfiguredTarget((ConfiguredTargetValue) entry.getValue());
-        } else if (functionName.equals(SkyFunctions.ASPECT)) {
-          AspectValue aspectValue = (AspectValue) entry.getValue();
-          AspectKey aspectKey = aspectValue.getKey();
-          ConfiguredTargetValue configuredTargetValue =
-              (ConfiguredTargetValue)
-                  memoizingEvaluator.getExistingValue(aspectKey.getBaseConfiguredTargetKey());
-          actionGraphDump.dumpAspect(aspectValue, configuredTargetValue);
+        SkyValue skyValue = entry.getValue();
+        // The skyValue may be null in case analysis of the previous build failed.
+        if (skyValue != null) {
+          if (functionName.equals(SkyFunctions.CONFIGURED_TARGET)) {
+            actionGraphDump.dumpConfiguredTarget((ConfiguredTargetValue) skyValue);
+          } else if (functionName.equals(SkyFunctions.ASPECT)) {
+            AspectValue aspectValue = (AspectValue) skyValue;
+            AspectKey aspectKey = aspectValue.getKey();
+            ConfiguredTargetValue configuredTargetValue =
+                (ConfiguredTargetValue)
+                memoizingEvaluator.getExistingValue(aspectKey.getBaseConfiguredTargetKey());
+            actionGraphDump.dumpAspect(aspectValue, configuredTargetValue);
+          }
         }
       } catch (InterruptedException e) {
         Thread.currentThread().interrupt();