Introduce common superclass for all native wrappers.

Author: fangerer

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

@@ -38,6 +38,7 @@
  */
 package com.oracle.graal.python.builtins.objects.cext;
 
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.NativeWrapper;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.TruffleObject;
 
@@ -48,7 +49,7 @@
  */
 public abstract class CArrayWrappers {
 
-    public abstract static class CArrayWrapper implements TruffleObject {
+    public abstract static class CArrayWrapper extends NativeWrapper {
 
         private Object nativePointer;
 

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

@@ -45,6 +45,7 @@
 import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.AsPythonObjectNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.ToJavaNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodesFactory.ToSulongNodeGen;
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.NativeWrapper;
 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;
@@ -128,7 +129,7 @@ Object runNativeObject(PythonAbstractObject object) {
             return PythonObjectNativeWrapper.wrap(object);
         }
 
-        @Specialization(guards = {"isForeignObject(object)"})
+        @Specialization(guards = {"isForeignObject(object)", "!isNativeWrapper(object)"})
         Object doPythonClass(TruffleObject object) {
             return TruffleObjectNativeWrapper.wrap(object);
         }
@@ -151,8 +152,8 @@ protected static boolean isNativeObject(PythonAbstractObject o) {
             return o instanceof PythonNativeObject;
         }
 
-        protected static boolean isForeignObject(Object o) {
-            return !(o instanceof PythonAbstractObject);
+        protected static boolean isNativeWrapper(Object o) {
+            return o instanceof NativeWrapper;
         }
 
         public static ToSulongNode create() {
@@ -220,7 +221,7 @@ protected boolean isForeignObject(TruffleObject obj) {
         }
 
         protected boolean isNativeWrapper(Object obj) {
-            return obj instanceof PythonNativeWrapper;
+            return obj instanceof NativeWrapper;
         }
 
         @TruffleBoundary
@@ -376,13 +377,13 @@ public static FromCharPointerNode create() {
     public static class GetNativeClassNode extends PBaseNode {
 
         @Child PCallNativeNode callGetObTypeNode;
-        @Child ToSulongNode toSulongNode;
         @Child ToJavaNode toJavaNode;
 
         @CompilationFinal private TruffleObject func;
 
         public PythonClass execute(PythonNativeObject object) {
-            Object[] args = new Object[]{getToSulongNode().execute(object.object)};
+            // do not convert wrap 'object.object' since that is really the native pointer object
+            Object[] args = new Object[]{object.object};
             return (PythonClass) getToJavaNode().execute(getCallGetObTypeNode().execute(getObTypeFunction(), args));
         }
 
@@ -394,14 +395,6 @@ private ToJavaNode getToJavaNode() {
             return toJavaNode;
         }
 
-        private ToSulongNode getToSulongNode() {
-            if (toSulongNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                toSulongNode = insert(ToSulongNode.create());
-            }
-            return toSulongNode;
-        }
-
         private PCallNativeNode getCallGetObTypeNode() {
             if (callGetObTypeNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();

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

@@ -38,6 +38,7 @@
  */
 package com.oracle.graal.python.builtins.objects.cext;
 
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.NativeWrapper;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.TruffleObject;
 
@@ -46,7 +47,7 @@
  */
 public abstract class ManagedMethodWrappers {
 
-    public abstract static class MethodWrapper implements TruffleObject {
+    public abstract static class MethodWrapper extends NativeWrapper {
         private final Object method;
 
         public MethodWrapper(Object method) {

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

@@ -49,7 +49,10 @@
 import com.oracle.truffle.api.object.Shape;
 
 public abstract class NativeWrappers {
-    public abstract static class PythonNativeWrapper implements TruffleObject {
+    public abstract static class NativeWrapper implements TruffleObject {
+    }
+
+    public abstract static class PythonNativeWrapper extends NativeWrapper {
 
         private Object nativePointer;
 

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

@@ -38,10 +38,11 @@
  */
 package com.oracle.graal.python.builtins.objects.cext;
 
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.NativeWrapper;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.TruffleObject;
 
-public abstract class PyAttributeProcsWrapper implements TruffleObject {
+public abstract class PyAttributeProcsWrapper extends NativeWrapper {
 
     private final Object delegate;
 

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

@@ -38,11 +38,12 @@
  */
 package com.oracle.graal.python.builtins.objects.cext;
 
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.NativeWrapper;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.TruffleObject;
 
-public class PyBufferProcsWrapper implements TruffleObject {
+public class PyBufferProcsWrapper extends NativeWrapper {
 
     private final PythonClass delegate;
 

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

@@ -38,13 +38,14 @@
  */
 package com.oracle.graal.python.builtins.objects.cext;
 
+import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.NativeWrapper;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.TruffleObject;
 
 /**
  * Wraps a PythonObject to proviate a native view with a shape like {@code PyNumberMethods}.
  */
-public class PyNumberMethodsWrapper implements TruffleObject {
+public class PyNumberMethodsWrapper extends NativeWrapper {
 
     private final Object delegate;