commit 795eab39b2e8a2b6a1344f1380d3ef0c0c32fffa
author jhorvitz <jhorvitz@google.com> Tue Dec 07 04:14:36 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Dec 07 04:15:45 2021 -0800
tree 2bdee9717c7f1fc8bd7bc5851fd22f9ac844ac74
parent f4db9ceb17094e1c8046306797ff79dc3966dcc9

Fix crash with `--experimental_skyframe_prepare_analysis` by accepting any `DetailedException`.

It is possible to get a `MissingInputFileException` if the file specified by `--platform_mappings` does not exist.

We apparently don't have any tests for `--experimental_skyframe_prepare_analysis`.

PiperOrigin-RevId: 414681532

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

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 a453c24..5267d3c 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
@@ -3037,8 +3037,8 @@
         e =
             new InvalidConfigurationException(
                 "cannot load build configuration because of this cycle", Code.CYCLE);
-      } else if (e instanceof NoSuchThingException) {
-        e = new InvalidConfigurationException(((NoSuchThingException) e).getDetailedExitCode(), e);
+      } else if (e instanceof DetailedException) {
+        e = new InvalidConfigurationException(((DetailedException) e).getDetailedExitCode(), e);
       }
       if (e != null) {
         Throwables.throwIfInstanceOf(e, InvalidConfigurationException.class);