From 207661777f3e696c1dbd4687791c14dae5af01e3 Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Mon, 19 May 2025 17:55:39 +0200
Subject: [PATCH] Add a missing null check on `SkyframeLookupResult#getOrThrow`

Speculative fix for #22066
---
 .../lib/skyframe/StarlarkBuildSettingsDetailsFunction.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkBuildSettingsDetailsFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkBuildSettingsDetailsFunction.java
index ea902c5c2a54c1..af5c19fdf941b1 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkBuildSettingsDetailsFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkBuildSettingsDetailsFunction.java
@@ -163,6 +163,9 @@ private static ImmutableMap<PackageIdentifier, PackageValue> getBuildSettingPack
       for (PackageIdentifier packageKey : packageKeys) {
         try {
           SkyValue skyValue = newlyLoaded.getOrThrow(packageKey, NoSuchPackageException.class);
+          if (skyValue == null) {
+            return null;
+          }
           buildSettingPackages.put(packageKey, (PackageValue) skyValue);
         } catch (NoSuchPackageException e) {
           throw new TransitionException(e);