Refactor hierarchy of native wrappers.

Author: fangerer

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

@@ -38,7 +38,7 @@
  */
 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.cext.NativeWrappers.PythonNativeWrapper;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.TruffleObject;
 
@@ -49,29 +49,13 @@
  */
 public abstract class CArrayWrappers {
 
-    public abstract static class CArrayWrapper extends NativeWrapper {
-
-        private Object nativePointer;
-
-        public Object getNativePointer() {
-            return nativePointer;
-        }
-
-        public void setNativePointer(Object nativePointer) {
-            assert this.nativePointer == null;
-            this.nativePointer = nativePointer;
-        }
-
-        public boolean isNative() {
-            return nativePointer != null;
-        }
-
-        public abstract Object getDelegate();
+    public abstract static class CArrayWrapper extends PythonNativeWrapper {
 
         static boolean isInstance(TruffleObject o) {
             return o instanceof CArrayWrapper;
         }
 
+        @Override
         public ForeignAccess getForeignAccess() {
             return CArrayWrapperMRForeign.ACCESS;
         }

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

@@ -45,7 +45,6 @@
 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;
@@ -74,7 +73,15 @@
 public abstract class CExtNodes {
 
     @ImportStatic(PGuards.class)
-    public abstract static class ToSulongNode extends PBaseNode {
+    abstract static class CExtBaseNode extends PBaseNode {
+
+        protected static boolean isNativeWrapper(Object obj) {
+            return obj instanceof PythonNativeWrapper;
+        }
+
+    }
+
+    public abstract static class ToSulongNode extends CExtBaseNode {
 
         public abstract Object execute(Object obj);
 
@@ -152,10 +159,6 @@ protected static boolean isNativeObject(PythonAbstractObject o) {
             return o instanceof PythonNativeObject;
         }
 
-        protected static boolean isNativeWrapper(Object o) {
-            return o instanceof NativeWrapper;
-        }
-
         public static ToSulongNode create() {
             return ToSulongNodeGen.create();
         }
@@ -165,8 +168,7 @@ public static ToSulongNode create() {
      * Unwraps objects contained in {@link PythonObjectNativeWrapper} instances or wraps objects
      * allocated in native code for consumption in Java.
      */
-    @ImportStatic(PGuards.class)
-    public abstract static class AsPythonObjectNode extends PBaseNode {
+    public abstract static class AsPythonObjectNode extends CExtBaseNode {
         public abstract Object execute(Object value);
 
         @Child GetClassNode getClassNode;
@@ -220,10 +222,6 @@ protected boolean isForeignObject(TruffleObject obj) {
             return getClassNode.execute(obj) == getCore().getForeignClass();
         }
 
-        protected boolean isNativeWrapper(Object obj) {
-            return obj instanceof NativeWrapper;
-        }
-
         @TruffleBoundary
         public static Object doSlowPath(Object object) {
             if (object instanceof PythonNativeWrapper) {
@@ -243,7 +241,7 @@ public static AsPythonObjectNode create() {
      * Does the same conversion as the native function {@code to_java}. The node tries to avoid
      * calling the native function for resolving native handles.
      */
-    public abstract static class ToJavaNode extends PBaseNode {
+    public abstract static class ToJavaNode extends CExtBaseNode {
         @Child private PCallNativeNode callNativeNode;
         @Child private AsPythonObjectNode toJavaNode = AsPythonObjectNode.create();
 
@@ -282,7 +280,7 @@ public static ToJavaNode create() {
         }
     }
 
-    public abstract static class AsCharPointer extends PBaseNode {
+    public abstract static class AsCharPointer extends CExtBaseNode {
 
         @CompilationFinal TruffleObject truffle_string_to_cstr;
         @CompilationFinal TruffleObject truffle_byte_array_to_native;
@@ -340,7 +338,7 @@ public static AsCharPointer create() {
         }
     }
 
-    public static class FromCharPointerNode extends PBaseNode {
+    public static class FromCharPointerNode extends CExtBaseNode {
 
         @CompilationFinal TruffleObject truffle_cstr_to_string;
         @Child private Node executeNode;
@@ -374,7 +372,7 @@ public static FromCharPointerNode create() {
         }
     }
 
-    public static class GetNativeClassNode extends PBaseNode {
+    public static class GetNativeClassNode extends CExtBaseNode {
 
         @Child PCallNativeNode callGetObTypeNode;
         @Child ToJavaNode toJavaNode;

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

@@ -38,7 +38,7 @@
  */
 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.cext.NativeWrappers.PythonNativeWrapper;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.TruffleObject;
 
@@ -47,21 +47,23 @@
  */
 public abstract class ManagedMethodWrappers {
 
-    public abstract static class MethodWrapper extends NativeWrapper {
+    public abstract static class MethodWrapper extends PythonNativeWrapper {
         private final Object method;
 
         public MethodWrapper(Object method) {
             this.method = method;
         }
 
-        public Object getMethod() {
+        @Override
+        public Object getDelegate() {
             return method;
         }
 
         static boolean isInstance(TruffleObject o) {
             return o instanceof MethodWrapper;
         }
 
+        @Override
         public ForeignAccess getForeignAccess() {
             return ManagedMethodWrappersMRForeign.ACCESS;
         }

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

@@ -103,7 +103,7 @@ public Object access(MethKeywords object, Object[] arguments) {
             Object[] userArgs = posArgsNode.executeWithArguments(null, posStarargsNode.executeWith(converted[0]));
             Object[] pArgs = createArgs.execute(userArgs);
             PKeyword[] kwargs = expandKwargsNode.executeWith(converted[1]);
-            return getToSulongNode().execute(getDispatchNode().executeCall(object.getMethod(), pArgs, kwargs));
+            return getToSulongNode().execute(getDispatchNode().executeCall(object.getDelegate(), pArgs, kwargs));
         }
 
         @ExplodeLoop
@@ -117,7 +117,7 @@ public Object access(MethVarargs object, Object[] arguments) {
             }
 
             // convert args
-            return getToSulongNode().execute(executeNode.execute(object.getMethod(), new Object[]{getToJavaNode().execute(arguments[0])}));
+            return getToSulongNode().execute(executeNode.execute(object.getDelegate(), new Object[]{getToJavaNode().execute(arguments[0])}));
         }
 
         private ToJavaNode getToJavaNode() {

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

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

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

@@ -38,18 +38,19 @@
  */
 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.cext.NativeWrappers.PythonNativeWrapper;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.TruffleObject;
 
-public abstract class PyAttributeProcsWrapper extends NativeWrapper {
+public abstract class PyAttributeProcsWrapper extends PythonNativeWrapper {
 
     private final Object delegate;
 
     public PyAttributeProcsWrapper(Object delegate) {
         this.delegate = delegate;
     }
 
+    @Override
     public Object getDelegate() {
         return delegate;
     }
@@ -58,6 +59,7 @@ static boolean isInstance(TruffleObject o) {
         return o instanceof PyAttributeProcsWrapper;
     }
 
+    @Override
     public ForeignAccess getForeignAccess() {
         return PyAttributeProcsWrapperMRForeign.ACCESS;
     }

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

@@ -38,19 +38,20 @@
  */
 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.cext.NativeWrappers.PythonNativeWrapper;
 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 extends NativeWrapper {
+public class PyBufferProcsWrapper extends PythonNativeWrapper {
 
     private final PythonClass delegate;
 
     public PyBufferProcsWrapper(PythonClass delegate) {
         this.delegate = delegate;
     }
 
+    @Override
     public PythonClass getDelegate() {
         return delegate;
     }
@@ -59,6 +60,7 @@ static boolean isInstance(TruffleObject o) {
         return o instanceof PyBufferProcsWrapper;
     }
 
+    @Override
     public ForeignAccess getForeignAccess() {
         return PyBufferProcsWrapperMRForeign.ACCESS;
     }

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

@@ -38,21 +38,22 @@
  */
 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.cext.NativeWrappers.PythonNativeWrapper;
 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}.
+ * Wraps a PythonObject to provide a native view with a shape like {@code PyNumberMethods}.
  */
-public class PyNumberMethodsWrapper extends NativeWrapper {
+public class PyNumberMethodsWrapper extends PythonNativeWrapper {
 
     private final Object delegate;
 
     public PyNumberMethodsWrapper(Object delegate) {
         this.delegate = delegate;
     }
 
+    @Override
     public Object getDelegate() {
         return delegate;
     }
@@ -61,6 +62,7 @@ static boolean isInstance(TruffleObject o) {
         return o instanceof PyNumberMethodsWrapper;
     }
 
+    @Override
     public ForeignAccess getForeignAccess() {
         return PyNumberMethodsWrapperMRForeign.ACCESS;
     }