Revert changes to _PyLong_Add as not relevant to this PR

Author: markshannon

Include/internal/pycore_long.h

@@ -113,7 +113,7 @@ PyAPI_DATA(PyObject*) _PyLong_Rshift(PyObject *, int64_t);
 // Export for 'math' shared extension
 PyAPI_DATA(PyObject*) _PyLong_Lshift(PyObject *, int64_t);
 
-PyAPI_FUNC(_PyStackRef) _PyLong_Add(PyLongObject *left, PyLongObject *right);
+PyAPI_FUNC(PyObject*) _PyLong_Add(PyLongObject *left, PyLongObject *right);
 PyAPI_FUNC(PyObject*) _PyLong_Multiply(PyLongObject *left, PyLongObject *right);
 PyAPI_FUNC(PyObject*) _PyLong_Subtract(PyLongObject *left, PyLongObject *right);
 

Include/internal/pycore_stackref.h

@@ -339,12 +339,6 @@ static const _PyStackRef PyStackRef_NULL = { .bits = PyStackRef_NULL_BITS };
 #define PyStackRef_False ((_PyStackRef){.bits = ((uintptr_t)&_Py_FalseStruct) | Py_TAG_IMMORTAL })
 #define PyStackRef_None ((_PyStackRef){.bits = ((uintptr_t)&_Py_NoneStruct) | Py_TAG_IMMORTAL })
 
-// #define PyStackRef_IsTrue(ref) ((ref).bits == (((uintptr_t)&_Py_TrueStruct) | Py_TAG_IMMORTAL))
-// #define PyStackRef_IsFalse(ref) ((ref).bits == (((uintptr_t)&_Py_FalseStruct) | Py_TAG_IMMORTAL))
-// #define
-
-/* We should be able to guarantee that the tag bits are set for immortal objects */
-
 #define PyStackRef_IsTrue(REF) ((REF).bits == (((uintptr_t)&_Py_TrueStruct) | Py_TAG_IMMORTAL))
 #define PyStackRef_IsFalse(REF) ((REF).bits == (((uintptr_t)&_Py_FalseStruct) | Py_TAG_IMMORTAL))
 #define PyStackRef_IsNone(REF) ((REF).bits == (((uintptr_t)&_Py_NoneStruct) | Py_TAG_IMMORTAL))

Objects/longobject.c

@@ -315,27 +315,6 @@ _PyLong_FromSTwoDigits(stwodigits x)
     return (PyLongObject*)_PyLong_FromLarge(x);
 }
 
-/* Create a new int object from a C word-sized int, return a stackref */
-static inline _PyStackRef
-_PyLongRef_FromSTwoDigitsRef(stwodigits x)
-{
-    if (IS_SMALL_INT(x)) {
-        return PyStackRef_FromPyObjectImmortal(get_small_int((sdigit)x));
-    }
-    assert(x != 0);
-    PyObject *res;
-    if (is_medium_int(x)) {
-        res = _PyLong_FromMedium((sdigit)x);
-    }
-    else {
-        res = _PyLong_FromLarge(x);
-    }
-    if (res == NULL) {
-        return PyStackRef_NULL;
-    }
-    return PyStackRef_FromPyObjectStealMortal(res);
-}
-
 /* If a freshly-allocated int is already shared, it must
    be a small integer, so negating it must go to PyLong_FromLong */
 Py_LOCAL_INLINE(void)
@@ -3897,14 +3876,10 @@ long_add(PyLongObject *a, PyLongObject *b)
     return z;
 }
 
-_PyStackRef
+PyObject *
 _PyLong_Add(PyLongObject *a, PyLongObject *b)
 {
-    if (_PyLong_BothAreCompact(a, b)) {
-        stwodigits z = medium_value(a) + medium_value(b);
-        return _PyLongRef_FromSTwoDigitsRef(z);
-    }
-    return PyStackRef_FromPyObjectSteal((PyObject*)long_add(a, b));
+    return (PyObject*)long_add(a, b);
 }
 
 static PyObject *

Python/bytecodes.c

@@ -601,11 +601,12 @@ dummy_func(
             assert(PyLong_CheckExact(right_o));
 
             STAT_INC(BINARY_OP, hit);
-            res = _PyLong_Add((PyLongObject *)left_o, (PyLongObject *)right_o);
+            PyObject *res_o = _PyLong_Add((PyLongObject *)left_o, (PyLongObject *)right_o);
             PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
             PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
             INPUTS_DEAD();
-            ERROR_IF(PyStackRef_IsNull(res), error);
+            ERROR_IF(res_o == NULL, error);
+            res = PyStackRef_FromPyObjectSteal(res_o);
         }
 
         pure op(_BINARY_OP_SUBTRACT_INT, (left, right -- res)) {