Allow native wrapper in 'PyTruffle_Set_Ptr'.

Author: fangerer

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

@@ -41,10 +41,7 @@
 
 MUST_INLINE static void force_to_native(void* obj) {
     if (polyglot_is_value(obj)) {
-        void* handle = truffle_deref_handle_for_managed(obj);
-        if(!polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_Set_Ptr", obj, handle)) {
-            truffle_release_handle(handle);
-        }
+        polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_Set_Ptr", obj, truffle_deref_handle_for_managed(obj));
     }
 }
 
@@ -95,9 +92,9 @@ static void initialize_globals() {
 }
 
 static void initialize_bufferprocs() {
-    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_SetBufferProcs", to_java((PyObject*)&PyBytes_Type), (getbufferproc)bytes_buffer_getbuffer, (releasebufferproc)NULL);
-    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_SetBufferProcs", to_java((PyObject*)&PyByteArray_Type), (getbufferproc)NULL, (releasebufferproc)NULL);
-    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_SetBufferProcs", to_java((PyObject*)&PyBuffer_Type), (getbufferproc)bufferdecorator_getbuffer, (releasebufferproc)NULL);
+    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_SetBufferProcs", native_to_java((PyObject*)&PyBytes_Type), (getbufferproc)bytes_buffer_getbuffer, (releasebufferproc)NULL);
+    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_SetBufferProcs", native_to_java((PyObject*)&PyByteArray_Type), (getbufferproc)NULL, (releasebufferproc)NULL);
+    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_SetBufferProcs", native_to_java((PyObject*)&PyBuffer_Type), (getbufferproc)bufferdecorator_getbuffer, (releasebufferproc)NULL);
 }
 
 __attribute__((constructor))

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

@@ -1199,9 +1199,17 @@ private GetClassNode getClassNode() {
     abstract static class PyTruffle_Set_Ptr extends NativeBuiltin {
 
         @Specialization
-        int doPythonObject(PythonObjectNativeWrapper nativeWrapper, TruffleObject ptr) {
-            nativeWrapper.setNativePointer(null);
-            nativeWrapper.setNativePointer(ptr);
+        int doPythonObject(PythonAbstractObject nativeWrapper, TruffleObject ptr) {
+            return doNativeWrapper(nativeWrapper.getNativeWrapper(), ptr);
+        }
+
+        @Specialization
+        int doNativeWrapper(PythonObjectNativeWrapper nativeWrapper, TruffleObject ptr) {
+            if (nativeWrapper.isNative()) {
+                PythonContext.getSingleNativeContextAssumption().invalidate();
+            } else {
+                nativeWrapper.setNativePointer(ptr);
+            }
             return 0;
         }
     }
@@ -1211,12 +1219,16 @@ int doPythonObject(PythonObjectNativeWrapper nativeWrapper, TruffleObject ptr) {
     abstract static class PyTruffle_SetBufferProcs extends NativeBuiltin {
 
         @Specialization
-        Object doPythonObject(PythonClass obj, Object getBufferProc, Object releaseBufferProc) {
-            PythonClassNativeWrapper nativeWrapper = obj.getNativeWrapper();
+        Object doNativeWrapper(PythonClassNativeWrapper nativeWrapper, Object getBufferProc, Object releaseBufferProc) {
             nativeWrapper.setGetBufferProc(getBufferProc);
             nativeWrapper.setReleaseBufferProc(releaseBufferProc);
             return PNone.NO_VALUE;
         }
+
+        @Specialization
+        Object doPythonObject(PythonClass obj, Object getBufferProc, Object releaseBufferProc) {
+            return doNativeWrapper(obj.getNativeWrapper(), getBufferProc, releaseBufferProc);
+        }
     }
 
     @Builtin(name = "PyTruffle_ThreadState_GetDict", fixedNumOfArguments = 0)

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

@@ -75,6 +75,7 @@
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.interop.PythonMessageResolution;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.truffle.api.Assumption;
@@ -601,7 +602,7 @@ long doSlow(PythonNativeWrapper obj,
         }
 
         protected Assumption getSingleNativeContextAssumption() {
-            return getContext().getSingleNativeContextAssumption();
+            return PythonContext.getSingleNativeContextAssumption();
         }
 
         public static PAsPointerNode create() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -69,7 +69,7 @@ public class PythonContext {
     private OutputStream out;
     private OutputStream err;
     @CompilationFinal private boolean capiWasLoaded = false;
-    private final Assumption singleNativeContext = Truffle.getRuntime().createAssumption("single native context assumption");
+    private final static Assumption singleNativeContext = Truffle.getRuntime().createAssumption("single native context assumption");
 
     @CompilationFinal private HashingStorage.Equivalence slowPathEquivalence;
 
@@ -222,7 +222,7 @@ public void initializeMainModule(String path) {
         }
     }
 
-    public Assumption getSingleNativeContextAssumption() {
+    public static Assumption getSingleNativeContextAssumption() {
         return singleNativeContext;
     }
 }