[GR-48700] Make interop nulls pass "is None" checks

PullRequest: graalpython/2978

Author: msimacek

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/interop/JavaInteropTest.java

@@ -193,6 +193,18 @@ public void javaArrayBytes() {
             assertPrints("b'\\x01\\x02\\x03\\x04'\n", source);
         }
 
+        @Test
+        public void javaNullIsNone() {
+            String source = """
+                            def is_none(x):
+                                return x is None
+                            is_none
+                            """;
+            Source script = Source.create("python", source);
+            Value isNone = context.eval(script);
+            assertTrue(isNone.execute((Object) null).asBoolean());
+        }
+
         @Test
         public void testPassingFloats() throws UnsupportedEncodingException {
             String source = "import polyglot\n" +

graalpython/com.oracle.graal.python.test/src/tests/test_interop.py

@@ -473,39 +473,20 @@ def test_java_null_is_none():
         y = Integer.getInteger("something_what_does_not_exists2")
         z = None
 
-        if __graalpython__.jython_emulation_enabled:
-
-            assert x == None
-            assert (x != None) == False
-            assert x is None
-            assert (x is not None) == False
-
-            assert x == y
-            assert (x != y) == False
-            assert x is y
-            assert (x is not y) == False
-
-            assert x == z
-            assert (x != z) == False
-            assert x is z
-            assert (x is not z) == False
-
-        else:
-
-            assert x == None
-            assert (x != None) == False
-            assert (x is None) == False
-            assert x is not None
-
-            assert x == y
-            assert (x != y) == False
-            assert x is y
-            assert (x is not y) == False
-
-            assert x == z
-            assert (x != z) == False
-            assert (x is z) == False
-            assert x is not z
+        assert x == None
+        assert (x != None) == False
+        assert x is None
+        assert (x is not None) == False
+
+        assert x == y
+        assert (x != y) == False
+        assert x is y
+        assert (x is not y) == False
+
+        assert x == z
+        assert (x != z) == False
+        assert x is z
+        assert (x is not z) == False
 
     def test_isinstance01():
         if __graalpython__.jython_emulation_enabled:

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/IsNode.java

@@ -43,7 +43,6 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___EQ__;
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
@@ -63,9 +62,9 @@
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -133,7 +132,7 @@ static boolean doIL(int left, long right) {
     @Specialization
     static boolean doIP(int left, PInt right,
                     @Bind("this") Node inliningTarget,
-                    @Cached.Shared("isBuiltin") @Cached IsAnyBuiltinObjectProfile isBuiltin) {
+                    @Shared("isBuiltin") @Cached IsAnyBuiltinObjectProfile isBuiltin) {
         if (isBuiltin.profileIsAnyBuiltinObject(inliningTarget, right)) {
             try {
                 return right.intValueExact() == left;
@@ -158,7 +157,7 @@ static boolean doLL(long left, long right) {
     @Specialization
     static boolean doLP(long left, PInt right,
                     @Bind("this") Node inliningTarget,
-                    @Cached.Shared("isBuiltin") @Cached IsAnyBuiltinObjectProfile isBuiltin) {
+                    @Shared("isBuiltin") @Cached IsAnyBuiltinObjectProfile isBuiltin) {
         if (isBuiltin.profileIsAnyBuiltinObject(inliningTarget, right)) {
             try {
                 return left == right.longValueExact();
@@ -185,14 +184,14 @@ boolean doPB(PInt left, boolean right) {
     @Specialization
     static boolean doPI(PInt left, int right,
                     @Bind("this") Node inliningTarget,
-                    @Cached.Shared("isBuiltin") @Cached IsAnyBuiltinObjectProfile isBuiltin) {
+                    @Shared("isBuiltin") @Cached IsAnyBuiltinObjectProfile isBuiltin) {
         return doIP(right, left, inliningTarget, isBuiltin);
     }
 
     @Specialization
     static boolean doPL(PInt left, long right,
                     @Bind("this") Node inliningTarget,
-                    @Cached.Shared("isBuiltin") @Cached IsAnyBuiltinObjectProfile isBuiltin) {
+                    @Shared("isBuiltin") @Cached IsAnyBuiltinObjectProfile isBuiltin) {
         return doLP(right, left, inliningTarget, isBuiltin);
     }
 
@@ -246,18 +245,25 @@ static boolean doCode(PCode left, PCode right,
 
     // none
     @Specialization
-    boolean doObjectPNone(Object left, PNone right) {
-        TruffleLanguage.Env env = PythonContext.get(this).getEnv();
-        if (PythonLanguage.get(this).getEngineOption(PythonOptions.EmulateJython) && env.isHostObject(left) && env.asHostObject(left) == null &&
-                        right == PNone.NONE) {
+    static boolean doObjectPNone(Object left, PNone right,
+                    @Bind("this") Node inliningTarget,
+                    @Shared @Cached IsForeignObjectNode isForeignObjectNode,
+                    @Shared @CachedLibrary(limit = "3") InteropLibrary lib) {
+        if (left == right) {
             return true;
         }
-        return left == right;
+        if (isForeignObjectNode.execute(inliningTarget, left)) {
+            return lib.isNull(left);
+        }
+        return false;
     }
 
     @Specialization
-    boolean doPNoneObject(PNone left, Object right) {
-        return doObjectPNone(right, left);
+    static boolean doPNoneObject(PNone left, Object right,
+                    @Bind("this") Node inliningTarget,
+                    @Shared @Cached IsForeignObjectNode isForeignObjectNode,
+                    @Shared @CachedLibrary(limit = "3") InteropLibrary lib) {
+        return doObjectPNone(right, left, inliningTarget, isForeignObjectNode, lib);
     }
 
     // pstring (may be interned)
@@ -277,8 +283,8 @@ static boolean doPString(PString left, PString right,
     @Fallback
     static boolean doOther(Object left, Object right,
                     @Bind("this") Node inliningTarget,
-                    @Cached IsForeignObjectNode isForeignObjectNode,
-                    @CachedLibrary(limit = "3") InteropLibrary lib) {
+                    @Shared @Cached IsForeignObjectNode isForeignObjectNode,
+                    @Shared @CachedLibrary(limit = "3") InteropLibrary lib) {
         if (left == right) {
             return true;
         }