Use special wrapper for initializing a native Python class.

fangerer · fangerer · commit ce333f221de2 · 2018-08-17T14:49:40.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.c b/graalpython/com.oracle.graal.python.cext/src/capi.c
@@ -156,6 +156,10 @@ inline void* handle_exception(void* val) {
     return val == ERROR_MARKER ? NULL : val;
 }
 
+// Heuristic to test if some value is a pointer object
+// TODO we need a reliable solution for that
+#define IS_POINTER(__val__) (polyglot_is_value(__val__) && !polyglot_fits_in_i64(__val__))
+
 void* native_to_java(PyObject* obj) {
     if (obj == Py_None) {
         return Py_None;
@@ -167,6 +171,8 @@ void* native_to_java(PyObject* obj) {
         return truffle_managed_from_handle(obj);
     } else if (truffle_is_handle_to_managed(obj->ob_refcnt)) {
         return truffle_managed_from_handle(obj->ob_refcnt);
+    } else if (IS_POINTER(obj->ob_refcnt)) {
+        return obj->ob_refcnt;
     }
     return obj;
 }
diff --git a/graalpython/com.oracle.graal.python.cext/src/typeobject.c b/graalpython/com.oracle.graal.python.cext/src/typeobject.c
@@ -245,7 +245,7 @@ int PyType_Ready(PyTypeObject* cls) {
                                             native_to_java(native_members));
 
     // remember the managed wrapper
-    ((PyObject*)cls)->ob_refcnt = truffle_handle_for_managed(javacls);
+    ((PyObject*)cls)->ob_refcnt = javacls;
     if (cls->tp_dict != NULL) {
         javacls->tp_dict = native_to_java(cls->tp_dict);
     } else {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java
@@ -70,6 +70,7 @@
 import com.oracle.graal.python.builtins.objects.cext.CArrayWrappers.CStringWrapper;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodes;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PySequenceArrayWrapper;
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonClassInitNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonClassNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonObjectNativeWrapper;
@@ -574,7 +575,7 @@ Object run(Object typestruct, PythonClass metaClass, PTuple baseClasses, PDict n
             if (module != null) {
                 writeNode.execute(cclass, SpecialAttributeNames.__MODULE__, module);
             }
-            return PythonClassNativeWrapper.wrap(cclass);
+            return new PythonClassInitNativeWrapper(cclass);
         }
 
         private String getStringItem(PDict nativeMembers, String key) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeWrappers.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeWrappers.java
@@ -188,6 +188,23 @@ public String toString() {
         }
     }
 
+    /**
+     * Used to wrap {@link PythonClass} just for the time when a natively defined type is processed
+     * in {@code PyType_Ready} and we need to pass the mirroring managed class to native to marry
+     * these two objects.
+     */
+    public static class PythonClassInitNativeWrapper extends PythonObjectNativeWrapper {
+
+        public PythonClassInitNativeWrapper(PythonClass object) {
+            super(object);
+        }
+
+        @Override
+        public String toString() {
+            return String.format("PythonClassNativeInitWrapper(%s, isNative=%s)", getPythonObject(), isNative());
+        }
+    }
+
     /**
      * Wraps a sequence object (like a list) such that it behaves like a bare C array.
      */
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapperMR.java
@@ -284,7 +284,7 @@ Object access(PySequenceArrayWrapper obj) {
         }
     }
 
-    abstract static class ToNativeArrayNode extends TransformToNativeNode {
+    abstract static class ToNativeArrayNode extends PBaseNode {
         @CompilationFinal private TruffleObject PyObjectHandle_FromJavaObject;
         @Child private PCallNativeNode callNativeBinary;
         @Child private ToNativeStorageNode toNativeStorageNode;
@@ -306,7 +306,7 @@ Object doPSequence(PySequenceArrayWrapper object) {
         @Fallback
         Object doGeneric(PySequenceArrayWrapper object) {
             // TODO correct element size
-            return ensureIsPointer(callBinaryIntoCapi(getNativeHandleForArray(), object, 8L));
+            return callBinaryIntoCapi(getNativeHandleForArray(), object, 8L);
         }
 
         private TruffleObject getNativeHandleForArray() {
@@ -449,7 +449,7 @@ public static GetTypeIDNode create() {
         }
     }
 
-    static abstract class ToNativeStorageNode extends TransformToNativeNode {
+    static abstract class ToNativeStorageNode extends PBaseNode {
         @Child private StorageToNativeNode storageToNativeNode;
 
         public abstract NativeSequenceStorage execute(SequenceStorage object);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyUnicodeWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyUnicodeWrapperMR.java
@@ -52,6 +52,7 @@
 import com.oracle.graal.python.builtins.objects.cext.PythonObjectNativeWrapperMR.ToPyObjectNode;
 import com.oracle.graal.python.builtins.objects.cext.UnicodeObjectNodes.UnicodeAsWideCharNode;
 import com.oracle.graal.python.builtins.objects.str.PString;
+import com.oracle.graal.python.nodes.PBaseNode;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -179,7 +180,7 @@ long access(PyUnicodeWrapper obj) {
         }
     }
 
-    abstract static class PyUnicodeToNativeNode extends TransformToNativeNode {
+    abstract static class PyUnicodeToNativeNode extends PBaseNode {
         @CompilationFinal private TruffleObject derefHandleIntrinsic;
         @Child private PCallNativeNode callNativeUnary;
         @Child private PCallNativeNode callNativeBinary;
@@ -189,7 +190,7 @@ abstract static class PyUnicodeToNativeNode extends TransformToNativeNode {
 
         @Specialization
         Object doUnicodeWrapper(PyUnicodeWrapper object) {
-            return ensureIsPointer(callUnaryIntoCapi(getPyObjectHandle_ForJavaType(), object));
+            return callUnaryIntoCapi(getPyObjectHandle_ForJavaType(), object);
         }
 
         private TruffleObject getPyObjectHandle_ForJavaType() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java
@@ -53,6 +53,7 @@
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PySequenceArrayWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PyUnicodeData;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PyUnicodeState;
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonClassInitNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.PythonObjectNativeWrapperMRFactory.PAsPointerNodeGen;
@@ -790,7 +791,15 @@ public Object access(Object object) {
     abstract static class ToNativeNode extends Node {
         @Child private ToPyObjectNode toPyObjectNode = ToPyObjectNode.create();
 
+        Object access(PythonClassInitNativeWrapper obj) {
+            if (!obj.isNative()) {
+                obj.setNativePointer(toPyObjectNode.getHandleForObject(obj.getDelegate(), 0));
+            }
+            return obj;
+        }
+
         Object access(PythonNativeWrapper obj) {
+            assert !(obj instanceof PythonClassInitNativeWrapper);
             if (!obj.isNative()) {
                 obj.setNativePointer(toPyObjectNode.execute(obj.getDelegate()));
             }
@@ -857,7 +866,7 @@ public static PAsPointerNode create() {
 
     }
 
-    abstract static class ToPyObjectNode extends TransformToNativeNode {
+    abstract static class ToPyObjectNode extends PBaseNode {
         @CompilationFinal private TruffleObject PyObjectHandle_FromJavaObject;
         @CompilationFinal private TruffleObject PyObjectHandle_FromJavaType;
         @CompilationFinal private TruffleObject PyNoneHandle;
@@ -870,23 +879,27 @@ abstract static class ToPyObjectNode extends TransformToNativeNode {
 
         @Specialization
         Object runNativeClass(PythonNativeClass object) {
-            return ensureIsPointer(object.object);
+            return object.object;
         }
 
         @Specialization
         Object runNativeObject(PythonNativeObject object) {
-            return ensureIsPointer(object.object);
+            return object.object;
         }
 
         @Specialization(guards = "isManagedPythonClass(object)")
         Object runClass(PythonClass object) {
-            return ensureIsPointer(callUnaryIntoCapi(getPyObjectHandle_ForJavaType(), getToSulongNode().execute(object)));
+            return callUnaryIntoCapi(getPyObjectHandle_ForJavaType(), getToSulongNode().execute(object));
         }
 
         @Fallback
         Object runObject(Object object) {
             PythonClass clazz = getClassNode().execute(object);
-            return ensureIsPointer(callBinaryIntoCapi(getPyObjectHandle_ForJavaObject(), getToSulongNode().execute(object), clazz.getFlags()));
+            return callBinaryIntoCapi(getPyObjectHandle_ForJavaObject(), getToSulongNode().execute(object), clazz.getFlags());
+        }
+
+        Object getHandleForObject(Object object, long flags) {
+            return callBinaryIntoCapi(getPyObjectHandle_ForJavaObject(), object, flags);
         }
 
         private TruffleObject getPyObjectHandle_ForJavaType() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/TransformToNativeNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/TransformToNativeNode.java

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,10 @@ inline void* handle_exception(void* val) {`
`156`	`156`	`return val == ERROR_MARKER ? NULL : val;`
`157`	`157`	`}`
`158`	`158`
	`159`	`+// Heuristic to test if some value is a pointer object`
	`160`	`+// TODO we need a reliable solution for that`
	`161`	`+#define IS_POINTER(__val__) (polyglot_is_value(__val__) && !polyglot_fits_in_i64(__val__))`
	`162`	`+`
`159`	`163`	`void* native_to_java(PyObject* obj) {`
`160`	`164`	`if (obj == Py_None) {`
`161`	`165`	`return Py_None;`
`@@ -167,6 +171,8 @@ void* native_to_java(PyObject* obj) {`
`167`	`171`	`return truffle_managed_from_handle(obj);`
`168`	`172`	`} else if (truffle_is_handle_to_managed(obj->ob_refcnt)) {`
`169`	`173`	`return truffle_managed_from_handle(obj->ob_refcnt);`
	`174`	`+ } else if (IS_POINTER(obj->ob_refcnt)) {`
	`175`	`+ return obj->ob_refcnt;`
`170`	`176`	`}`
`171`	`177`	`return obj;`
`172`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ Object access(PySequenceArrayWrapper obj) {`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`
`287`		`- abstract static class ToNativeArrayNode extends TransformToNativeNode {`
	`287`	`+ abstract static class ToNativeArrayNode extends PBaseNode {`
`288`	`288`	`@CompilationFinal private TruffleObject PyObjectHandle_FromJavaObject;`
`289`	`289`	`@Child private PCallNativeNode callNativeBinary;`
`290`	`290`	`@Child private ToNativeStorageNode toNativeStorageNode;`
`@@ -306,7 +306,7 @@ Object doPSequence(PySequenceArrayWrapper object) {`
`306`	`306`	`@Fallback`
`307`	`307`	`Object doGeneric(PySequenceArrayWrapper object) {`
`308`	`308`	`// TODO correct element size`
`309`		`- return ensureIsPointer(callBinaryIntoCapi(getNativeHandleForArray(), object, 8L));`
	`309`	`+ return callBinaryIntoCapi(getNativeHandleForArray(), object, 8L);`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`private TruffleObject getNativeHandleForArray() {`
`@@ -449,7 +449,7 @@ public static GetTypeIDNode create() {`
`449`	`449`	`}`
`450`	`450`	`}`
`451`	`451`
`452`		`- static abstract class ToNativeStorageNode extends TransformToNativeNode {`
	`452`	`+ static abstract class ToNativeStorageNode extends PBaseNode {`
`453`	`453`	`@Child private StorageToNativeNode storageToNativeNode;`
`454`	`454`
`455`	`455`	`public abstract NativeSequenceStorage execute(SequenceStorage object);`