Fix StarlarkIndexable.getIndex implementations that return null.

They should return Starlark.NONE instead. Part of Optional Toolchains (bazelbuild#14726).
katre · Apr 26, 2022 · 5338455 · 5338455
1 parent ff6ac53
commit 5338455
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintCollection.java
@@ -233,7 +233,11 @@ public Sequence<ConstraintSettingInfo> constraintSettings() {
 
   @Override
   public Object getIndex(StarlarkSemantics semantics, Object key) throws EvalException {
-    return get(convertKey(key));
+    Object result = get(convertKey(key));
+    if (result == null) {
+      result = Starlark.NONE;
+    }
+    return result;
   }
 
   @Override

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkToolchainContext.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkToolchainContext.java
@@ -30,6 +30,7 @@
 import net.starlark.java.eval.Starlark;
 import net.starlark.java.eval.StarlarkSemantics;
 import net.starlark.java.eval.StarlarkThread;
+import net.starlark.java.eval.StarlarkValue;
 
 /**
  * An implementation of ToolchainContextApi that can better handle converting strings into Labels.
@@ -99,7 +100,7 @@ private Label transformKey(StarlarkThread starlarkThread, Object key) throws Eva
   }
 
   @Override
-  public ToolchainInfo getIndex(
+  public StarlarkValue getIndex(
       StarlarkThread starlarkThread, StarlarkSemantics semantics, Object key) throws EvalException {
     Label toolchainTypeLabel = transformKey(starlarkThread, key);
 
@@ -116,7 +117,11 @@ public ToolchainInfo getIndex(
               .map(Label::toString)
               .collect(joining(", ")));
     }
-    return toolchainContext().forToolchainType(toolchainTypeLabel);
+    ToolchainInfo toolchainInfo = toolchainContext().forToolchainType(toolchainTypeLabel);
+    if (toolchainInfo == null) {
+      return Starlark.NONE;
+    }
+    return toolchainInfo;
   }
 
   @Override

diff --git a/...st/java/com/google/devtools/build/lib/skyframe/SingleToolchainResolutionFunctionTest.java b/...st/java/com/google/devtools/build/lib/skyframe/SingleToolchainResolutionFunctionTest.java
@@ -34,6 +34,7 @@
 import com.google.devtools.build.skyframe.SkyKey;
 import javax.annotation.Nullable;
 import net.starlark.java.eval.Printer;
+import net.starlark.java.eval.Starlark;
 import net.starlark.java.eval.StarlarkSemantics;
 import org.junit.Before;
 import org.junit.Test;
@@ -253,7 +254,7 @@ public void repr(Printer printer) {}
 
     @Override
     public Object getIndex(StarlarkSemantics semantics, Object key) {
-      return null;
+      return Starlark.NONE;
     }
 
     @Override