Make PyStackRef_BoxInt inline for JIT

Author: markshannon

Include/internal/pycore_stackref.h

@@ -292,8 +292,6 @@ PyStackRef_TaggedIntLessThan(_PyStackRef a, _PyStackRef b)
 
 #define PyStackRef_IsDeferredOrTaggedInt(ref) (((ref).bits & Py_TAG_REFCNT) != 0)
 
-extern _PyStackRef PyStackRef_BoxInt(_PyStackRef i);
-
 #ifdef Py_GIL_DISABLED
 
 #define Py_TAG_DEFERRED Py_TAG_REFCNT
@@ -807,6 +805,20 @@ _Py_TryXGetStackRef(PyObject **src, _PyStackRef *out)
         }                                                               \
     } while (0)
 
+
+static inline _PyStackRef
+PyStackRef_BoxInt(_PyStackRef i)
+{
+    assert(PyStackRef_IsTaggedInt(i));
+    intptr_t val = PyStackRef_UntagInt(i);
+    PyObject *boxed = PyLong_FromSsize_t(val);
+    if (boxed == NULL) {
+        return PyStackRef_NULL;
+    }
+    return PyStackRef_FromPyObjectSteal(boxed);
+}
+
+
 #ifdef __cplusplus
 }
 #endif

Objects/longobject.c

@@ -6873,19 +6873,3 @@ PyLongWriter_Finish(PyLongWriter *writer)
 
     return (PyObject*)obj;
 }
-
-// Tagged int support
-
-_PyStackRef
-PyStackRef_BoxInt(_PyStackRef i)
-{
-    assert((i.bits & Py_INT_TAG) == Py_INT_TAG);
-    intptr_t val = (intptr_t)i.bits;
-    val = Py_ARITHMETIC_RIGHT_SHIFT(intptr_t, val, 2);
-    PyObject *boxed = PyLong_FromSsize_t(val);
-    if (boxed == NULL) {
-        return PyStackRef_NULL;
-    }
-    return PyStackRef_FromPyObjectSteal(boxed);
-}
-