be explicit about bitwidths of tagged integers hiding in handles

Author: timfel

graalpython/com.oracle.graal.python.cext/include/graalpy/handles.h

@@ -75,15 +75,15 @@
 #define points_to_py_float_handle(PTR) (((uint64_t)(uintptr_t)(PTR)) & FLOAT_TAG_BIT)
 
 #define stub_to_pointer(STUB_PTR) ((uintptr_t)(((uint64_t)(uintptr_t)(PTR)) | HANDLE_TAG_BIT))
-#define int_to_pointer(INT)       ((uintptr_t)((((uint64_t)(uint32_t)(INT) << 3) & _35_BIT_MASK) | HANDLE_TAG_BIT | INTEGER_TAG_BIT))
+#define int32_to_pointer(INT)       ((uintptr_t)((((uint64_t)(uint32_t)(INT) << 3) & _35_BIT_MASK) | HANDLE_TAG_BIT | INTEGER_TAG_BIT))
 static inline PyObject* float_to_pointer(float dbl) {
     uint32_t float_bits;
     memcpy(&float_bits, &dbl, sizeof(float));
     return (PyObject *)(uintptr_t)(((((uint64_t)float_bits) << 3) & _35_BIT_MASK) | HANDLE_TAG_BIT | FLOAT_TAG_BIT);
 }
 
 #define pointer_to_stub(PTR)  ((PyObject*)(((uint64_t)(uintptr_t)(PTR)) & ~HANDLE_TAG_BIT))
-#define pointer_to_long(PTR)   ((int64_t)(int32_t)(((uint64_t)(uintptr_t)(PTR)) >> 3))
+#define pointer_to_int64(PTR)   ((int64_t)(int32_t)(((uint64_t)(uintptr_t)(PTR)) >> 3))
 static inline double pointer_to_double(PyObject* ptr) {
     uint32_t float_bits = (uint32_t)(((uint64_t)(uintptr_t)ptr) >> 3);
     float value;

graalpython/com.oracle.graal.python.cext/include/internal/pycore_long.h

@@ -71,15 +71,15 @@ static inline PyObject* _PyLong_GetZero(void)
 /* GraalVM change
 { return (PyObject *)&_PyLong_SMALL_INTS[_PY_NSMALLNEGINTS]; }
 */
-{ return int_to_pointer(0); }
+{ return int32_to_pointer(0); }
 
 // Return a borrowed reference to the one singleton.
 // The function cannot return NULL.
 static inline PyObject* _PyLong_GetOne(void)
 /* GraalVM change
 { return (PyObject *)&_PyLong_SMALL_INTS[_PY_NSMALLNEGINTS+1]; }
 */
-{ return int_to_pointer(1); }
+{ return int32_to_pointer(1); }
 
 static inline PyObject* _PyLong_FromUnsignedChar(unsigned char i)
 {

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

@@ -333,7 +333,7 @@ PyFloat_AsDouble(PyObject *op)
     // GraalPy change: upcall for managed
     if (points_to_py_handle_space(op)) {
         if (points_to_py_int_handle(op)) {
-            return (double)pointer_to_long(op);
+            return (double)pointer_to_int64(op);
         }
         return GraalPyPrivate_Float_AsDouble(op);
     }

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

@@ -86,7 +86,7 @@ static PyObject *
 get_small_int(sdigit ival)
 {
     // GraalPy change - we tag 32-bit integers
-    return int_to_pointer(ival);
+    return int32_to_pointer(ival);
 }
 
 #if 0 // GraalPy change
@@ -474,7 +474,7 @@ PyLong_AsLongAndOverflow(PyObject *vv, int *overflow)
     }
     if (points_to_py_int_handle(vv)) {
         *overflow = 0;
-        return pointer_to_long(vv);
+        return pointer_to_int64(vv);
     }
     long result = (long) GraalPyPrivate_Long_AsPrimitive(vv, MODE_COERCE_SIGNED, sizeof(long));
     if (result == -1L && PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_OverflowError)) {
@@ -494,7 +494,7 @@ PyLong_AsLong(PyObject *obj)
 {
     // GraalPy change: different implementation
     if (points_to_py_int_handle(obj)) {
-        return pointer_to_long(obj);
+        return pointer_to_int64(obj);
     }
     return (long) GraalPyPrivate_Long_AsPrimitive(obj, MODE_COERCE_SIGNED, sizeof(long));
 }
@@ -523,7 +523,7 @@ _PyLong_AsInt(PyObject *obj)
 Py_ssize_t
 PyLong_AsSsize_t(PyObject *vv) {
     if (points_to_py_int_handle(vv)) {
-        return pointer_to_long(vv);
+        return pointer_to_int64(vv);
     }
     return (Py_ssize_t) GraalPyPrivate_Long_AsPrimitive(vv, MODE_PINT_SIGNED, sizeof(Py_ssize_t));
 }
@@ -540,7 +540,7 @@ PyLong_AsUnsignedLong(PyObject *vv)
         return (unsigned long) -1;
     }
     if (points_to_py_int_handle(vv)) {
-        long value = pointer_to_long(vv);
+        long value = pointer_to_int64(vv);
         if (value < 0) {
             PyErr_SetString(PyExc_OverflowError, "can't convert negative value to unsigned int");
             return (unsigned long) -1;
@@ -558,7 +558,7 @@ PyLong_AsSize_t(PyObject *vv)
 {
     // GraalPy change: different implementation
     if (points_to_py_int_handle(vv)) {
-        long value = pointer_to_long(vv);
+        long value = pointer_to_int64(vv);
         if (value < 0) {
             PyErr_SetString(PyExc_OverflowError, "can't convert negative value to unsigned int");
             return (size_t) -1;
@@ -610,7 +610,7 @@ PyLong_AsUnsignedLongMask(PyObject *op)
         return (unsigned long) -1;
     }
     if (points_to_py_int_handle(op)) {
-        return pointer_to_long(op);
+        return pointer_to_int64(op);
     }
     return (unsigned long) GraalPyPrivate_Long_AsPrimitive(op, MODE_COERCE_MASK, sizeof(unsigned long));
 }
@@ -979,7 +979,7 @@ PyLong_FromLongLong(long long ival)
 {
     // GraalPy change: different implementation
     if ((int)ival == ival) {
-        return int_to_pointer(ival);
+        return int32_to_pointer(ival);
     } else {
         return GraalPyPrivate_Long_FromLongLong(ival);
     }
@@ -1006,7 +1006,7 @@ PyLong_AsLongLong(PyObject *vv)
         return -1;
     }
     if (points_to_py_int_handle(vv)) {
-        return pointer_to_long(vv);
+        return pointer_to_int64(vv);
     }
     return (long long) GraalPyPrivate_Long_AsPrimitive(vv, MODE_COERCE_SIGNED, sizeof(long long));
 }
@@ -1023,7 +1023,7 @@ PyLong_AsUnsignedLongLong(PyObject *vv)
         return (unsigned long long)-1;
     }
     if (points_to_py_int_handle(vv)) {
-        long value = pointer_to_long(vv);
+        long value = pointer_to_int64(vv);
         if (value < 0) {
             PyErr_SetString(PyExc_OverflowError, "can't convert negative value to unsigned int");
             return (unsigned long long) -1;
@@ -1076,7 +1076,7 @@ PyLong_AsUnsignedLongLongMask(PyObject *op)
         return (unsigned long long)-1;
     }
     if (points_to_py_int_handle(op)) {
-        return pointer_to_long(op);
+        return pointer_to_int64(op);
     }
     return (unsigned long long) GraalPyPrivate_Long_AsPrimitive(op, MODE_COERCE_MASK, sizeof(unsigned long long));
 }
@@ -6140,15 +6140,15 @@ PyUnstable_Long_CompactValue(const PyLongObject* op) {
 
 Py_ssize_t PyUnstable_Long_CompactValue(const PyLongObject *op) {
     if (points_to_py_int_handle(op)) {
-        return pointer_to_long(op);
+        return pointer_to_int64(op);
     }
     return GraalPyPrivate_Long_AsPrimitive((PyObject*) op, MODE_PINT_SIGNED, sizeof(Py_ssize_t));
 }
 
 // GraalPy additions
 uintptr_t GraalPyPrivate_Long_lv_tag(const PyLongObject *op) {
     if (points_to_py_int_handle(op)) {
-        int64_t t = pointer_to_long(op);
+        int64_t t = pointer_to_int64(op);
         if (t == 0) {
             return SIGN_ZERO;
         }