Properly implement eq and repr for PythonNativeVoidPtr.

Author: fangerer

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

@@ -97,23 +97,6 @@ Py_ssize_t PyLong_AsSsize_t(PyObject *obj) {
     return UPCALL_CEXT_L(_jls_PyLong_AsPrimitive, native_to_java(obj), 1, sizeof(Py_ssize_t));
 }
 
-PyObject * PyLong_FromVoidPtr(void *p) {
-#if SIZEOF_VOID_P <= SIZEOF_LONG
-    return PyLong_FromUnsignedLongLong((unsigned long)p);
-#else
-
-#if SIZEOF_LONG_LONG < SIZEOF_VOID_P
-#   error "PyLong_FromVoidPtr: sizeof(long long) < sizeof(void*)"
-#endif
-    return PyLong_FromUnsignedLongLong((unsigned long long)(uintptr_t)p);
-#endif /* SIZEOF_VOID_P <= SIZEOF_LONG */
-}
-
-UPCALL_ID(PyLong_AsVoidPtr);
-void * PyLong_AsVoidPtr(PyObject *obj){
-    return (void *)UPCALL_CEXT_PTR(_jls_PyLong_AsVoidPtr, native_to_java(obj));
-}
-
 UPCALL_ID(PyLong_FromLongLong);
 PyObject * PyLong_FromLong(long n)  {
     return UPCALL_CEXT_O(_jls_PyLong_FromLongLong, n, 1);
@@ -131,6 +114,16 @@ PyObject * PyLong_FromUnsignedLongLong(unsigned long long n) {
     return UPCALL_CEXT_O(_jls_PyLong_FromLongLong, n, 0);
 }
 
+PyObject * PyLong_FromVoidPtr(void *p) {
+	// directly do the upcall to avoid a cast to primitive
+    return UPCALL_CEXT_O(_jls_PyLong_FromLongLong, p, 0);
+}
+
+UPCALL_ID(PyLong_AsVoidPtr);
+void * PyLong_AsVoidPtr(PyObject *obj){
+    return (void *)UPCALL_CEXT_PTR(_jls_PyLong_AsVoidPtr, native_to_java(obj));
+}
+
 UPCALL_ID(_PyLong_Sign);
 int _PyLong_Sign(PyObject *vv) {
     return UPCALL_CEXT_I(_jls__PyLong_Sign, native_to_java(vv));

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

@@ -44,6 +44,7 @@
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
@@ -65,4 +66,11 @@ public int compareTo(Object o) {
     public LazyPythonClass getLazyPythonClass() {
         return PythonBuiltinClassType.PInt;
     }
+
+    @Override
+    public String toString() {
+        CompilerAsserts.neverPartOfCompilation();
+        return String.format("PythonNativeVoidPtr(%s)", object);
+    }
+
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java

@@ -100,6 +100,10 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
+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.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
@@ -1407,6 +1411,62 @@ boolean eqPiPi(PInt a, PInt b) {
             return a.equals(b);
         }
 
+        @Specialization
+        boolean eqVoidPtrLong(PythonNativeVoidPtr a, long b,
+                        @Shared("lib") @CachedLibrary(limit = "1") InteropLibrary lib) {
+            if (lib.isPointer(a.object)) {
+                try {
+                    long ptrVal = lib.asPointer(a.object);
+                    // pointers are considered unsigned
+                    return ptrVal >= 0L && ptrVal == b;
+                } catch (UnsupportedMessageException e) {
+                    // fall through
+                }
+            }
+            return doHash(a.object, b);
+        }
+
+        @Specialization
+        boolean eqLongVoidPtr(long a, PythonNativeVoidPtr b,
+                        @Shared("lib") @CachedLibrary(limit = "1") InteropLibrary lib) {
+            return eqVoidPtrLong(b, a, lib);
+        }
+
+        @Specialization
+        @TruffleBoundary
+        boolean eqVoidPtrPInt(PythonNativeVoidPtr a, PInt b,
+                        @Shared("lib") @CachedLibrary(limit = "1") InteropLibrary lib) {
+            if (lib.isPointer(a.object)) {
+                try {
+                    long ptrVal = lib.asPointer(a.object);
+                    if (ptrVal < 0) {
+                        // pointers are considered unsigned
+                        BigInteger bi = BigInteger.valueOf(ptrVal).add(BigInteger.ONE.shiftLeft(64));
+                        return bi.equals(b.getValue());
+                    }
+                    return BigInteger.valueOf(ptrVal).equals(b.getValue());
+                } catch (UnsupportedMessageException e) {
+                    // fall through
+                }
+            }
+            try {
+                return a.object.hashCode() == b.longValueExact();
+            } catch (ArithmeticException e) {
+                return false;
+            }
+        }
+
+        @Specialization
+        boolean eqPIntVoidPtr(PInt a, PythonNativeVoidPtr b,
+                        @Shared("lib") @CachedLibrary(limit = "1") InteropLibrary lib) {
+            return eqVoidPtrPInt(b, a, lib);
+        }
+
+        @TruffleBoundary
+        private static boolean doHash(Object object, long b) {
+            return object.hashCode() == b;
+        }
+
         @SuppressWarnings("unused")
         @Fallback
         PNotImplemented eq(Object a, Object b) {
@@ -2184,6 +2244,24 @@ public String doL(long self) {
         public String doPInt(PInt self) {
             return self.toString();
         }
+
+        @Specialization
+        public String doNativeVoidPtr(PythonNativeVoidPtr self,
+                        @CachedLibrary(limit = "1") InteropLibrary lib) {
+            if (lib.isPointer(self.object)) {
+                try {
+                    return Long.toString(lib.asPointer(self.object));
+                } catch (UnsupportedMessageException e) {
+                    // fall through
+                }
+            }
+            return doHash(self.object);
+        }
+
+        @TruffleBoundary
+        private static String doHash(Object object) {
+            return Integer.toString(object.hashCode());
+        }
     }
 
     @Builtin(name = SpecialMethodNames.__REPR__, minNumOfPositionalArgs = 1)