Merge branch 'compact-ints2' into specialize-on-compact-int

mdboom · Jan 28, 2025 · a5eaf63 · a5eaf63
2 parents 114feb3 + e25f138
commit a5eaf63
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Include/cpython/longintrepr.h b/Include/cpython/longintrepr.h
@@ -91,7 +91,8 @@ typedef long stwodigits; /* signed variant of twodigits */
 */
 
 typedef struct _PyLongValue {
-    uintptr_t lv_tag; /* Number of digits, sign and flags */
+    // uintptr_t lv_tag; /* Number of digits, sign and flags */
+    uint32_t lv_tag; /* Number of digits, sign and flags */
     digit ob_digit[1];
 } _PyLongValue;
 
@@ -132,7 +133,7 @@ _PyLong_CompactValue(const PyLongObject *op)
     Py_ssize_t sign;
     assert(PyType_HasFeature(op->ob_base.ob_type, Py_TPFLAGS_LONG_SUBCLASS));
     assert(PyUnstable_Long_IsCompact(op));
-    sign = 1 - (op->long_value.lv_tag & _PyLong_SIGN_MASK);
+    sign = 1l - (op->long_value.lv_tag & _PyLong_SIGN_MASK);
     return sign * (Py_ssize_t)op->long_value.ob_digit[0];
 }
 

diff --git a/Include/internal/pycore_long.h b/Include/internal/pycore_long.h
@@ -237,7 +237,7 @@ static inline Py_ssize_t
 _PyLong_SignedDigitCount(const PyLongObject *op)
 {
     assert(PyLong_Check(op));
-    Py_ssize_t sign = 1 - (op->long_value.lv_tag & SIGN_MASK);
+    Py_ssize_t sign = 1l - (op->long_value.lv_tag & SIGN_MASK);
     return sign * (Py_ssize_t)(op->long_value.lv_tag >> NON_SIZE_BITS);
 }
 

diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -585,6 +585,7 @@ PyLong_AsInt(PyObject *obj)
     int overflow;
     long result = PyLong_AsLongAndOverflow(obj, &overflow);
     if (overflow || result > INT_MAX || result < INT_MIN) {
+    // if (overflow || (int)result > INT_MAX || (int)result < INT_MIN) {
         /* XXX: could be cute and give a different
            message for overflow == -1 */
         PyErr_SetString(PyExc_OverflowError,