Fix two incorrect usages of SkyframeLookupResult

fmeum · copybara-github · commit 1025821bb121 · 2025-12-12T13:16:21.000-08:00
All the values have to be checked for nullness individually. Fixes the following two NPEs: 1. bazel-contrib/rules_go#4531 (comment) ``` java.lang.NullPointerException: Cannot invoke "com.google.devtools.build.lib.skyframe.PackageValue.getPackage()" because the return value of "com.google.devtools.build.skyframe.SkyframeLookupResult.getOrThrow(com.google.devtools.build.skyframe.SkyKey, java.lang.Class)" is null at com.google.devtools.build.lib.skyframe.TestExpansionFunction.getPrerequisites(TestExpansionFunction.java:169) at com.google.devtools.build.lib.skyframe.TestExpansionFunction.computeExpandedTests(TestExpansionFunction.java:85) ... ``` 2. #27942 ``` java.lang.NullPointerException at java.base/java.util.stream.ReferencePipeline$3$1.accept(Unknown Source) at java.base/java.util.stream.ReferencePipeline$3$1.accept(Unknown Source) at java.base/java.util.stream.ReferencePipeline$3$1.accept(Unknown Source) at java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Unknown Source) at java.base/java.util.stream.AbstractPipeline.copyInto(Unknown Source) at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(Unknown Source) at java.base/java.util.stream.ReduceOps$ReduceOp.evaluateSequential(Unknown Source) at java.base/java.util.stream.AbstractPipeline.evaluate(Unknown Source) at java.base/java.util.stream.ReferencePipeline.collect(Unknown Source) at com.google.devtools.build.lib.skyframe.DirectoryTreeDigestFunction.getSubDirTreeDigests(DirectoryTreeDigestFunction.java:140) at com.google.devtools.build.lib.skyframe.DirectoryTreeDigestFunction.compute(DirectoryTreeDigestFunction.java:65) ``` Speculative fix for #27942 Closes #27959. PiperOrigin-RevId: 843808256 Change-Id: I012756ec8a641c68bca31fe155d230caa00d8a3f
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryTreeDigestFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryTreeDigestFunction.java
@@ -29,6 +29,7 @@
 import com.google.devtools.build.skyframe.SkyValue;
 import com.google.devtools.build.skyframe.SkyframeLookupResult;
 import java.io.IOException;
+import java.util.Objects;
 import java.util.stream.StreamSupport;
 import javax.annotation.Nullable;
 
@@ -129,19 +130,15 @@ private static ImmutableList<String> getSubDirTreeDigests(
             .map(p -> DirectoryTreeDigestValue.key(p.getSecond().realRootedPath(p.getFirst())))
             .collect(toImmutableSet());
     SkyframeLookupResult result = env.getValuesAndExceptions(dirTreeDigestValueKeys);
-    if (env.valuesMissing()) {
-      return null;
-    }
-    ImmutableList<String> dirTreeDigests =
-        dirTreeDigestValueKeys.stream()
-            .map(result::get)
-            .map(DirectoryTreeDigestValue.class::cast)
-            .map(DirectoryTreeDigestValue::hexDigest)
-            .collect(toImmutableList());
-    if (env.valuesMissing()) {
+    if (env.valuesMissing()
+        || dirTreeDigestValueKeys.stream().map(result::get).anyMatch(Objects::isNull)) {
       return null;
     }
-    return dirTreeDigests;
+    return dirTreeDigestValueKeys.stream()
+        .map(result::get)
+        .map(DirectoryTreeDigestValue.class::cast)
+        .map(DirectoryTreeDigestValue::hexDigest)
+        .collect(toImmutableList());
   }
 
   private static final class DirectoryTreeDigestFunctionException extends SkyFunctionException {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestExpansionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestExpansionFunction.java
@@ -164,9 +164,11 @@ private static boolean getPrerequisites(
     Map<PackageIdentifier, Package> packageMap = new HashMap<>();
     for (PackageIdentifier key : pkgIdentifiers) {
       try {
-        packageMap.put(
-            key,
-            ((PackageValue) packages.getOrThrow(key, NoSuchPackageException.class)).getPackage());
+        var packageValue = (PackageValue) packages.getOrThrow(key, NoSuchPackageException.class);
+        if (packageValue == null) {
+          return false;
+        }
+        packageMap.put(key, packageValue.getPackage());
       } catch (NoSuchPackageException e) {
         env.getListener().handle(Event.error(e.getMessage()));
         hasError = true;
