[GR-68087] Implement PyUnstable_Long_IsCompact and PyUnstable_Long_CompactValue.

PullRequest: graalpython/3918

Author: steve-s

graalpython/com.oracle.graal.python.cext/include/cpython/longintrepr.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, 2024, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2025, Oracle and/or its affiliates.
  * Copyright (C) 1996-2017 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -109,6 +109,7 @@ _PyLong_FromDigits(int negative, Py_ssize_t digit_count, digit *digits);
 #define _PyLong_SIGN_MASK 3
 #define _PyLong_NON_SIZE_BITS 3
 
+#if 0 // GraalPy change
 
 static inline int
 _PyLong_IsCompact(const PyLongObject* op) {
@@ -118,6 +119,12 @@ _PyLong_IsCompact(const PyLongObject* op) {
 
 #define PyUnstable_Long_IsCompact _PyLong_IsCompact
 
+#endif // GraalPy change
+
+#define _PyLong_IsCompact PyUnstable_Long_IsCompact
+
+#if 0 // GraalPy change
+
 static inline Py_ssize_t
 _PyLong_CompactValue(const PyLongObject *op)
 {
@@ -130,6 +137,9 @@ _PyLong_CompactValue(const PyLongObject *op)
 
 #define PyUnstable_Long_CompactValue _PyLong_CompactValue
 
+#endif // GraalPy change
+
+#define _PyLong_CompactValue PyUnstable_Long_CompactValue
 
 #ifdef __cplusplus
 }

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

@@ -6100,6 +6100,12 @@ PyUnstable_Long_CompactValue(const PyLongObject* op) {
 
 #endif // GraalPy change
 
+#undef PyUnstable_Long_CompactValue
+
+Py_ssize_t
+PyUnstable_Long_CompactValue(const PyLongObject *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) {

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_long.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -127,6 +127,11 @@ def _reference_sign(args):
     else:
         return 1
 
+def _reference_is_compact(args):
+    n = args[0]
+    # the range is impl. specific, but let's assume it's at least int32
+    return 1 if -2147483648 <= n <= 2147483647 else 0
+
 
 class DummyNonInt():
     pass
@@ -420,7 +425,25 @@ class TestPyLong(CPyExtTestCase):
         argspec="OniiO",
         arguments=["PyObject* object", "Py_ssize_t n", "int little_endian", "int is_signed", "PyObject* unused"],
     )
-    
+
+    test_PyUnstable_Long_IsCompact = CPyExtFunction(
+        _reference_is_compact,
+        # for CPython the range is different, so we test only obvious values
+        lambda: ((0,),  (-1,), (1,), (9223372036854775807 * 10,)),
+        resultspec="i",
+        argspec='O',
+        arguments=["PyLongObject* o"],
+    )
+
+    test_PyUnstable_Long_CompactValue = CPyExtFunction(
+        lambda x: x[0],
+        # for CPython the range is different, so we test only obvious values
+        lambda: ((0,),  (-1,), (1,)),
+        resultspec="l",
+        argspec='O',
+        arguments=["PyLongObject* o"],
+    )
+
     test__PyLong_Sign = CPyExtFunction(
         _reference_sign,
         lambda: (

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextLongBuiltins.java

@@ -45,6 +45,7 @@
 import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Ignored;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.CONST_UNSIGNED_CHAR_PTR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.CharPtrAsTruffleString;
+import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.ConstPyLongObject;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Int;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.LONG_LONG;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Pointer;
@@ -231,6 +232,20 @@ Object fromString(Object s, int base,
         }
     }
 
+    @CApiBuiltin(ret = Int, args = {ConstPyLongObject}, call = Direct)
+    abstract static class PyUnstable_Long_IsCompact extends CApiUnaryBuiltinNode {
+        @Specialization
+        @TruffleBoundary
+        static int doI(Object value) {
+            if (value instanceof Integer || value instanceof Long) {
+                return 1;
+            } else if (value instanceof PInt pInt) {
+                return pInt.fitsIn(PInt.MIN_LONG, PInt.MAX_LONG) ? 1 : 0;
+            }
+            return 0;
+        }
+    }
+
     @CApiBuiltin(ret = LONG_LONG, args = {PyObject, Int, SIZE_T}, call = Ignored)
     abstract static class GraalPyPrivate_Long_AsPrimitive extends CApiTernaryBuiltinNode {
 

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

@@ -1264,8 +1264,7 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyUnstable_InterpreterFrame_GetCode", ret = PyObjectRawPointer, args = {_PyInterpreterFrame}, call = NotImplemented)
     @CApiBuiltin(name = "PyUnstable_InterpreterFrame_GetLasti", ret = PrimitiveResult32, args = {_PyInterpreterFrame}, call = NotImplemented)
     @CApiBuiltin(name = "PyUnstable_InterpreterFrame_GetLine", ret = PrimitiveResult32, args = {_PyInterpreterFrame}, call = NotImplemented)
-    @CApiBuiltin(name = "PyUnstable_Long_CompactValue", ret = Py_ssize_t, args = {ConstPyLongObject}, call = NotImplemented)
-    @CApiBuiltin(name = "PyUnstable_Long_IsCompact", ret = PrimitiveResult32, args = {ConstPyLongObject}, call = NotImplemented)
+    @CApiBuiltin(name = "PyUnstable_Long_CompactValue", ret = Py_ssize_t, args = {ConstPyLongObject}, call = CImpl)
     @CApiBuiltin(name = "PyUnstable_Object_GC_NewWithExtraData", ret = PyObjectRawPointer, args = {PyTypeObjectTransfer, SIZE_T}, call = CImpl)
     @CApiBuiltin(name = "PyUnstable_PerfMapState_Fini", ret = Void, args = {}, call = NotImplemented)
     @CApiBuiltin(name = "PyUnstable_PerfMapState_Init", ret = PrimitiveResult32, args = {}, call = NotImplemented)

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

@@ -681,7 +681,7 @@ public static boolean fitsIn(BigInteger value, BigInteger left, BigInteger right
         return value.compareTo(left) >= 0 && value.compareTo(right) <= 0;
     }
 
-    private boolean fitsIn(BigInteger left, BigInteger right) {
+    public boolean fitsIn(BigInteger left, BigInteger right) {
         return fitsIn(value, left, right);
     }