Allow multiple native contexts.

Author: fangerer

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

@@ -51,6 +51,7 @@
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PySequenceArrayWrapper;
 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;
 import com.oracle.graal.python.builtins.objects.cext.PythonObjectNativeWrapperMRFactory.ReadNativeMemberNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.PythonObjectNativeWrapperMRFactory.ToPyObjectNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.PythonObjectNativeWrapperMRFactory.WriteNativeMemberNodeGen;
@@ -76,6 +77,7 @@
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.runtime.interop.PythonMessageResolution;
 import com.oracle.graal.python.runtime.sequence.PSequence;
+import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -529,7 +531,7 @@ public Object access(Object object) {
 
     @Resolve(message = "TO_NATIVE")
     abstract static class ToNativeNode extends Node {
-        @Child private ToPyObjectNode toPyObjectNode = ToPyObjectNodeGen.create();
+        @Child private ToPyObjectNode toPyObjectNode = ToPyObjectNode.create();
 
         Object access(PythonNativeWrapper obj) {
             if (!obj.isNative()) {
@@ -543,7 +545,7 @@ Object access(PythonNativeWrapper obj) {
     abstract static class IsPointerNode extends Node {
         @Child private Node isPointerNode;
 
-        Object access(PythonNativeWrapper obj) {
+        boolean access(PythonNativeWrapper obj) {
             return obj.isNative() && (!(obj.getNativePointer() instanceof TruffleObject) || ForeignAccess.sendIsPointer(getIsPointerNode(), (TruffleObject) obj.getNativePointer()));
         }
 
@@ -558,11 +560,26 @@ private Node getIsPointerNode() {
 
     @Resolve(message = "AS_POINTER")
     abstract static class AsPointerNode extends Node {
-        @Child private Node asPointerNode;
+        @Child private PAsPointerNode pAsPointerNode = PAsPointerNode.create();
 
         long access(PythonNativeWrapper obj) {
+            return pAsPointerNode.execute(obj);
+        }
+    }
+
+    abstract static class PAsPointerNode extends PBaseNode {
+        @Child private Node asPointerNode;
+
+        public abstract long execute(PythonNativeWrapper o);
+
+        @Specialization(assumptions = "getSingleNativeContextAssumption()")
+        long doFast(PythonNativeWrapper obj) {
             // the native pointer object must either be a TruffleObject or a primitive
             Object nativePointer = obj.getNativePointer();
+            return ensureLong(nativePointer);
+        }
+
+        private long ensureLong(Object nativePointer) {
             if (nativePointer instanceof TruffleObject) {
                 if (asPointerNode == null) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -575,8 +592,22 @@ long access(PythonNativeWrapper obj) {
                 }
             }
             return (long) nativePointer;
+        }
 
+        @Specialization(replaces = "doFast")
+        long doSlow(PythonNativeWrapper obj,
+                        @Cached("create()") ToPyObjectNode toPyObjectNode) {
+            return ensureLong(toPyObjectNode.execute(obj));
         }
+
+        protected Assumption getSingleNativeContextAssumption() {
+            return getContext().getSingleNativeContextAssumption();
+        }
+
+        public static PAsPointerNode create() {
+            return PAsPointerNodeGen.create();
+        }
+
     }
 
     abstract static class ToPyObjectNode extends TransformToNativeNode {
@@ -662,5 +693,9 @@ private CExtNodes.ToSulongNode getToSulongNode() {
             }
             return toSulongNode;
         }
+
+        public static ToPyObjectNode create() {
+            return ToPyObjectNodeGen.create();
+        }
     }
 }

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

@@ -41,10 +41,12 @@
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
+import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 
 public class PythonContext {
@@ -67,6 +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");
 
     @CompilationFinal private HashingStorage.Equivalence slowPathEquivalence;
 
@@ -218,4 +221,8 @@ public void initializeMainModule(String path) {
             mainModule.setAttribute(__FILE__, path);
         }
     }
+
+    public Assumption getSingleNativeContextAssumption() {
+        return singleNativeContext;
+    }
 }