]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] GH-101291: Avoid using macros with casts in low-level long API. (GH-104742...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Tue, 23 May 2023 09:28:04 +0000 (02:28 -0700)
committerGitHub <noreply@github.com>
Tue, 23 May 2023 09:28:04 +0000 (09:28 +0000)
(cherry picked from commit e295d8605699ad3d8ec46c8d55a5e47da05b20c6)

Co-authored-by: Mark Shannon <mark@hotpy.org>
Include/cpython/longintrepr.h

index 0f569935fff14a4403ab63d5e4108913cb594b2c..692c69ba76db2ffd25fa9f3aa2090b4fa255444e 100644 (file)
@@ -104,9 +104,10 @@ _PyLong_FromDigits(int negative, Py_ssize_t digit_count, digit *digits);
 #define _PyLong_SIGN_MASK 3
 #define _PyLong_NON_SIZE_BITS 3
 
+
 static inline int
 _PyLong_IsCompact(const PyLongObject* op) {
-    assert(PyLong_Check(op));
+    assert(PyType_HasFeature((op)->ob_base.ob_type, Py_TPFLAGS_LONG_SUBCLASS));
     return op->long_value.lv_tag < (2 << _PyLong_NON_SIZE_BITS);
 }
 
@@ -115,7 +116,7 @@ _PyLong_IsCompact(const PyLongObject* op) {
 static inline Py_ssize_t
 _PyLong_CompactValue(const PyLongObject *op)
 {
-    assert(PyLong_Check(op));
+    assert(PyType_HasFeature((op)->ob_base.ob_type, Py_TPFLAGS_LONG_SUBCLASS));
     assert(PyUnstable_Long_IsCompact(op));
     Py_ssize_t sign = 1 - (op->long_value.lv_tag & _PyLong_SIGN_MASK);
     return sign * (Py_ssize_t)op->long_value.ob_digit[0];