commit d79efbe854909795a43cffff02fdca1613341c89
author Googler <leba@google.com> Tue Aug 01 02:16:27 2023 -0700
committer fweikert <fwe@google.com> Wed Aug 09 19:45:45 2023 +0200
tree b9a38c2edd35fac6353eb9a0b8785a2ae30e1fc6
parent cb0cf7f83bbc6998633ccec58b86a59ce03e30c3

[Skymeld] Account for the GLOB -> GLOB inconsistency.

This can happen with `--discard_analysis_cache`, when a GLOB node (execution phase) refers to another GLOB node (analysis phase, now cleared).

PiperOrigin-RevId: 552736907
Change-Id: I039fe5395df7c5aaa496ccaddb508bdad62a67a1

src/main/java/com/google/devtools/build/lib/skyframe/SkymeldInconsistencyReceiver.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkymeldInconsistencyReceiver.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkymeldInconsistencyReceiver.java
index 4c3c15d..70ca31d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkymeldInconsistencyReceiver.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkymeldInconsistencyReceiver.java
@@ -30,7 +30,9 @@
 public class SkymeldInconsistencyReceiver implements GraphInconsistencyReceiver {
   private static final ImmutableMap<SkyFunctionName, SkyFunctionName>
       SKYMELD_EXPECTED_MISSING_CHILDREN =
-          ImmutableMap.of(SkyFunctions.ACTION_EXECUTION, SkyFunctions.GLOB);
+          ImmutableMap.of(
+              SkyFunctions.ACTION_EXECUTION, SkyFunctions.GLOB,
+              SkyFunctions.GLOB, SkyFunctions.GLOB);
 
   private final boolean heuristicallyDropNodes;