Also allow Long in PythonAbstractNativeObject

Author: fangerer

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

@@ -926,7 +926,7 @@ private static Object[] collect(MroSequenceStorage mro, int idx) {
                 if (value != PNone.NO_VALUE) {
                     Object[] tuple = (Object[]) value;
                     assert tuple.length == 2;
-                    l.add(new PythonAbstractNativeObject((TruffleObject) tuple[idx]));
+                    l.add(new PythonAbstractNativeObject(tuple[idx]));
                 }
             }
             return l.toArray();

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

@@ -75,7 +75,6 @@
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
@@ -89,9 +88,9 @@
 @ExportLibrary(PythonBufferAcquireLibrary.class)
 public final class PythonAbstractNativeObject extends PythonAbstractObject implements PythonNativeObject, PythonNativeClass {
 
-    public final TruffleObject object;
+    public final Object object;
 
-    public PythonAbstractNativeObject(TruffleObject object) {
+    public PythonAbstractNativeObject(Object object) {
         this.object = object;
     }
 
@@ -105,7 +104,8 @@ public void lookupChanged() {
         throw new UnsupportedOperationException("not yet implemented");
     }
 
-    public TruffleObject getPtr() {
+    @Override
+    public Object getPtr() {
         return object;
     }
 

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

@@ -41,7 +41,6 @@
 package com.oracle.graal.python.builtins.objects.cext;
 
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
-import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.object.HiddenKey;
 
 /**
@@ -54,7 +53,7 @@ public interface PythonNativeClass extends PythonAbstractClass {
 
     public static final HiddenKey INSTANCESHAPE = new HiddenKey("instanceshape");
 
-    TruffleObject getPtr();
+    Object getPtr();
 
     default String getName() {
         return String.format("PythonNativeClass(%s)", getPtr());

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

@@ -40,14 +40,12 @@
  */
 package com.oracle.graal.python.builtins.objects.cext;
 
-import com.oracle.truffle.api.interop.TruffleObject;
-
 /**
  * A simple wrapper around objects created through the Python C API that can be cast to PyObject*.
  */
 public interface PythonNativeObject {
 
-    TruffleObject getPtr();
+    Object getPtr();
 
     static boolean isInstance(Object object) {
         return object instanceof PythonAbstractNativeObject;

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

@@ -43,7 +43,6 @@
 
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.interop.TruffleObject;
 
 /**
  * Represents the value of a native pointer as Python int.<br/>
@@ -55,17 +54,17 @@
  * this eager transformation using this wrapper.
  */
 public class PythonNativeVoidPtr extends PythonAbstractObject {
-    private final TruffleObject object;
+    private final Object object;
     private final long nativePointerValue;
     private final boolean hasNativePointer;
 
-    public PythonNativeVoidPtr(TruffleObject object) {
+    public PythonNativeVoidPtr(Object object) {
         this.object = object;
         this.nativePointerValue = 0;
         this.hasNativePointer = false;
     }
 
-    public PythonNativeVoidPtr(TruffleObject object, long nativePointerValue) {
+    public PythonNativeVoidPtr(Object object, long nativePointerValue) {
         this.object = object;
         this.nativePointerValue = nativePointerValue;
         this.hasNativePointer = true;

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

@@ -350,7 +350,7 @@ static class NativeObjectReference extends WeakReference<PythonAbstractNativeObj
         /**
          * The associated native pointer object that needs to be released if this reference dies.
          */
-        final TruffleObject ptrObject;
+        final Object ptrObject;
 
         /** The ID of this reference, i.e., the index of the ref in the global reference list. */
         final int id;
@@ -374,7 +374,7 @@ public NativeObjectReference(PythonAbstractNativeObject referent, ReferenceQueue
             this.id = id;
         }
 
-        public TruffleObject getPtrObject() {
+        public Object getPtrObject() {
             return ptrObject;
         }
 

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

@@ -1447,7 +1447,7 @@ static Object doForeign(@SuppressWarnings("unused") CExtContext nativeContext, O
                         @Cached ConditionProfile isNullProfile) {
             // this branch is not a shortcut; it actually returns a different object
             if (isNullProfile.profile(interopLibrary.isNull(value))) {
-                return new PythonAbstractNativeObject((TruffleObject) value);
+                return new PythonAbstractNativeObject(value);
             }
             return asPythonObjectNode.execute(resolveHandleNode.execute(value));
         }

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

@@ -128,7 +128,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.interop.UnknownIdentifierException;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.interop.UnsupportedTypeException;
@@ -1354,7 +1353,7 @@ protected Object[] prepareCArguments(VirtualFrame frame) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw PRaiseNode.raiseUncached(this, SystemError, "Attempting to getter function but object has no associated native space.");
             }
-            objects[0] = new PythonAbstractNativeObject((TruffleObject) nativeSpacePtr);
+            objects[0] = new PythonAbstractNativeObject(nativeSpacePtr);
             return objects;
         }
 
@@ -1436,7 +1435,7 @@ protected Object[] prepareCArguments(VirtualFrame frame) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw PRaiseNode.raiseUncached(this, SystemError, "Attempting to setter function but object has no associated native space.");
             }
-            objects[0] = new PythonAbstractNativeObject((TruffleObject) nativeSpacePtr);
+            objects[0] = new PythonAbstractNativeObject(nativeSpacePtr);
             return objects;
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -274,7 +274,7 @@ public final PythonObject createPythonObject(Object klass, Shape instanceShape)
         return trace(new PythonObject(klass, instanceShape));
     }
 
-    public final PythonNativeVoidPtr createNativeVoidPtr(TruffleObject obj) {
+    public final PythonNativeVoidPtr createNativeVoidPtr(Object obj) {
         return trace(new PythonNativeVoidPtr(obj));
     }