Remove 'PNone.NATIVE_NONE' and properly wrap 'PNone.NONE'.

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -47,7 +47,7 @@ static void initialize_type_structure(PyTypeObject* structure, const char* typna
 }
 
 static void initialize_globals() {
-    void *jnone = polyglot_as__object(polyglot_invoke(PY_TRUFFLE_CEXT, "Py_None"));
+    void *jnone = polyglot_as__object(to_sulong(polyglot_invoke(PY_TRUFFLE_CEXT, "Py_None")));
     truffle_assign_managed(&_Py_NoneStruct, jnone);
     void *jnotimpl = polyglot_as__object(polyglot_get_member(PY_BUILTIN, "NotImplemented"));
     truffle_assign_managed(&_Py_NotImplementedStruct, jnotimpl);
@@ -152,10 +152,6 @@ typedef struct PyObjectHandle {
     PyObject_HEAD
 } PyObjectHandle;
 
-PyObject* PyNoneHandle(void* jobj) {
-    return &_Py_NoneStruct;
-}
-
 uint64_t PyTruffle_Wchar_Size() {
     return SIZEOF_WCHAR_T;
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java

@@ -63,7 +63,6 @@
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
 import com.oracle.graal.python.builtins.objects.cpyobject.NativeCAPISymbols;
-import com.oracle.graal.python.builtins.objects.cpyobject.PCallNativeNode;
 import com.oracle.graal.python.builtins.objects.cpyobject.PythonNativeClass;
 import com.oracle.graal.python.builtins.objects.cpyobject.PythonNativeObject;
 import com.oracle.graal.python.builtins.objects.cpyobject.PythonObjectNativeWrapper;
@@ -232,8 +231,6 @@ Object run(String str) {
     @Builtin(name = "to_sulong", fixedNumOfArguments = 1)
     @GenerateNodeFactory
     public abstract static class ToSulongNode extends PythonUnaryBuiltinNode {
-        @CompilationFinal private TruffleObject PyNoneHandle;
-        @Child private PCallNativeNode callNative;
 
         /*
          * This is very sad. Only for Sulong, we cannot hand out java.lang.Strings, because then it
@@ -277,7 +274,7 @@ Object runNativeObject(PythonNativeObject object) {
 
         @Specialization(guards = "isNone(none)")
         Object run(PNone none) {
-            return callIntoCapi(none, getPyNoneHandle());
+            return PythonObjectNativeWrapper.wrap(none);
         }
 
         @Specialization(guards = "!isNativeClass(object)")
@@ -294,22 +291,6 @@ protected boolean isNativeClass(PythonObject o) {
             return o instanceof PythonNativeClass;
         }
 
-        private TruffleObject getPyNoneHandle() {
-            if (PyNoneHandle == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                PyNoneHandle = (TruffleObject) getContext().getEnv().importSymbol(NativeCAPISymbols.FUN_PY_NONE_HANDLE);
-            }
-            return PyNoneHandle;
-        }
-
-        private Object callIntoCapi(PythonAbstractObject arg, TruffleObject function) {
-            if (callNative == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                callNative = insert(PCallNativeNode.create(1));
-            }
-            return callNative.execute(function, new Object[]{arg});
-        }
-
         public static ToSulongNode create() {
             return TruffleCextBuiltinsFactory.ToSulongNodeFactory.create(null);
         }
@@ -697,7 +678,7 @@ private Object checkFunctionResult(Object result) {
     abstract static class PNativeToPTypeNode extends PForeignToPTypeNode {
 
         @Specialization
-        protected static PythonObject fromNativeNone(PythonObjectNativeWrapper nativeWrapper) {
+        protected static PythonAbstractObject fromNativeNone(PythonObjectNativeWrapper nativeWrapper) {
             return nativeWrapper.getPythonObject();
         }
 
@@ -720,7 +701,7 @@ PNone doNoValue() {
     abstract static class PyNoneNode extends PythonBuiltinNode {
         @Specialization
         PNone doNativeNone() {
-            return PNone.NATIVE_NONE;
+            return PNone.NONE;
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PNone.java

@@ -30,12 +30,6 @@ public final class PNone extends PythonAbstractObject {
     public static final PNone NONE = new PNone();
     public static final PNone NO_VALUE = new PNone();
 
-    /**
-     * Object representing {@code None} in the native code but is not a interop {@code null} value
-     * such that it is not interpreted as a null pointer.
-     */
-    public static final PNone NATIVE_NONE = new PNone();
-
     private PNone() {
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -38,12 +38,24 @@
  */
 package com.oracle.graal.python.builtins.objects;
 
+import com.oracle.graal.python.builtins.objects.cpyobject.PythonObjectNativeWrapper;
 import com.oracle.graal.python.runtime.interop.PythonMessageResolutionForeign;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.TruffleObject;
 
 public abstract class PythonAbstractObject implements TruffleObject, Comparable<Object> {
+    private PythonObjectNativeWrapper nativeWrapper;
+
     public final ForeignAccess getForeignAccess() {
         return PythonMessageResolutionForeign.ACCESS;
     }
+
+    public PythonObjectNativeWrapper getNativeWrapper() {
+        return nativeWrapper;
+    }
+
+    public void setNativeWrapper(PythonObjectNativeWrapper nativeWrapper) {
+        assert this.nativeWrapper == null;
+        this.nativeWrapper = nativeWrapper;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cpyobject/PythonObjectNativeWrapper.java

@@ -38,19 +38,19 @@
  */
 package com.oracle.graal.python.builtins.objects.cpyobject;
 
-import com.oracle.graal.python.builtins.objects.object.PythonObject;
+import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.TruffleObject;
 
 /**
- * Used to wrap {@link PythonObject} when used in native code. This wrapper mimics the correct shape
- * of the corresponding native type {@code struct _object}.
+ * Used to wrap {@link PythonAbstractObject} when used in native code. This wrapper mimics the
+ * correct shape of the corresponding native type {@code struct _object}.
  */
 public class PythonObjectNativeWrapper implements TruffleObject {
-    private final PythonObject pythonObject;
+    private final PythonAbstractObject pythonObject;
     private Object nativePointer;
 
-    public PythonObjectNativeWrapper(PythonObject object) {
+    public PythonObjectNativeWrapper(PythonAbstractObject object) {
         this.pythonObject = object;
     }
 
@@ -68,7 +68,7 @@ public void setNativePointer(Object nativePointer) {
         this.nativePointer = nativePointer;
     }
 
-    public PythonObject getPythonObject() {
+    public PythonAbstractObject getPythonObject() {
         return pythonObject;
     }
 
@@ -80,7 +80,7 @@ public ForeignAccess getForeignAccess() {
         return PythonObjectNativeWrapperMRForeign.ACCESS;
     }
 
-    public static PythonObjectNativeWrapper wrap(PythonObject obj) {
+    public static PythonObjectNativeWrapper wrap(PythonAbstractObject obj) {
         // important: native wrappers are cached
         PythonObjectNativeWrapper nativeWrapper = obj.getNativeWrapper();
         if (nativeWrapper == null) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cpyobject/PythonObjectNativeWrapperMR.java

@@ -388,7 +388,8 @@ Object runNativeObject(PythonNativeObject object) {
 
         @Specialization
         Object runNone(PNone object) {
-            return ensureIsPointer(callUnaryIntoCapi(object, getPyNoneHandle()));
+            PythonClass clazz = getClassNode().execute(object);
+            return ensureIsPointer(callBinaryIntoCapi(getPyObjectHandle_ForJavaObject(), object, clazz.getFlags()));
         }
 
         @Specialization(guards = "isNonNative(object)")
@@ -444,14 +445,6 @@ protected boolean isNonNative(PythonClass klass) {
             return !(klass instanceof PythonNativeClass);
         }
 
-        private TruffleObject getPyNoneHandle() {
-            if (PyNoneHandle == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                PyNoneHandle = (TruffleObject) getContext().getEnv().importSymbol(NativeCAPISymbols.FUN_PY_NONE_HANDLE);
-            }
-            return PyNoneHandle;
-        }
-
         private Object callUnaryIntoCapi(PythonAbstractObject arg, TruffleObject fun) {
             if (callNativeUnary == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java

@@ -35,7 +35,6 @@
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
-import com.oracle.graal.python.builtins.objects.cpyobject.PythonObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
@@ -52,8 +51,6 @@ public class PythonObject extends PythonAbstractObject {
     protected final PythonClass pythonClass;
     @CompilationFinal protected DynamicObject storage;
     private PDict dict;
-    private PythonObjectNativeWrapper nativeWrapper;
-
     public PythonObject(PythonClass pythonClass) {
         if (pythonClass == null) {
             CompilerDirectives.transferToInterpreter();
@@ -201,13 +198,4 @@ public PDict getDict() {
     public void setDict(PDict dict) {
         this.dict = dict;
     }
-
-    public PythonObjectNativeWrapper getNativeWrapper() {
-        return nativeWrapper;
-    }
-
-    public void setNativeWrapper(PythonObjectNativeWrapper nativeWrapper) {
-        assert this.nativeWrapper == null;
-        this.nativeWrapper = nativeWrapper;
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PGuards.java

@@ -91,10 +91,6 @@ public static boolean isNone(Object value) {
         return value == PNone.NONE;
     }
 
-    public static boolean isNativeNone(Object value) {
-        return value == PNone.NATIVE_NONE;
-    }
-
     public static boolean isNoValue(Object object) {
         return object == PNone.NO_VALUE;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/interop/PForeignToPTypeNode.java

@@ -41,7 +41,6 @@
  */
 package com.oracle.graal.python.nodes.interop;
 
-import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -76,11 +75,6 @@ protected static String fromChar(char value) {
         return String.valueOf(value);
     }
 
-    @Specialization(guards = "isNativeNone(none)")
-    protected static PNone fromNativeNone(@SuppressWarnings("unused") PNone none) {
-        return PNone.NONE;
-    }
-
     @Fallback
     protected static Object fromObjectGeneric(Object value) {
         return value;