Apply review suggestions

eendebakpt · Nov 20, 2024 · db8247e · db8247e
1 parent 6b73046
commit db8247e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -43,7 +43,7 @@ static inline void
 _Py_DECREF_INT(PyLongObject *op)
 {
     assert(PyLong_CheckExact(op));
-    _Py_DECREF_SPECIALIZED((PyObject *)op, (destructor)PyObject_Free); // needs to be converted to freelist?
+    _Py_DECREF_SPECIALIZED((PyObject *)op, (destructor) _PyLong_ExactDealloc);
 }
 
 static inline int
@@ -222,7 +222,9 @@ _PyLong_FromMedium(sdigit x)
     assert(!IS_SMALL_INT(x));
     assert(is_medium_int(x));
 
-    PyLongObject *v = _Py_FREELIST_POP(PyLongObject, ints);
+    // The small int cache is incompatible with _Py_NewReference which is called
+    // by _Py_FREELIST_POP.
+    PyLongObject *v = (PyLongObject *)_Py_FREELIST_POP_MEM(ints);
     if (v == NULL) {
         v = PyObject_Malloc(sizeof(PyLongObject));
         if (v == NULL) {
@@ -3618,13 +3620,13 @@ long_richcompare(PyObject *self, PyObject *other, int op)
 void
 _PyLong_ExactDealloc(PyObject *self)
 {
-    assert(PyLong_CheckExact(self));
-
-    if (_PyLong_IsCompact((PyLongObject *)self)) {
-        _Py_FREELIST_FREE(ints, self, PyObject_Free);
-        return;
+    if (PyLong_CheckExact(self)) {
+        if (_PyLong_IsCompact((PyLongObject *)self)) {
+            _Py_FREELIST_FREE(ints, self, PyObject_Free);
+            return;
+        }
     }
-    PyObject_Free(self);
+    Py_TYPE(self)->tp_free(self);
 }
 
 static void

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -516,7 +516,7 @@ dummy_func(
             STAT_INC(BINARY_OP, hit);
             PyObject *res_o = _PyLong_Multiply((PyLongObject *)left_o, (PyLongObject *)right_o);
             PyStackRef_CLOSE_SPECIALIZED(right, (destructor)_PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, (destructor)PyObject_Free); // needs to be converted to freelist
+            PyStackRef_CLOSE_SPECIALIZED(left, (destructor)_PyLong_ExactDealloc);
             INPUTS_DEAD();
             ERROR_IF(res_o == NULL, error);
             res = PyStackRef_FromPyObjectSteal(res_o);
@@ -529,7 +529,7 @@ dummy_func(
             STAT_INC(BINARY_OP, hit);
             PyObject *res_o = _PyLong_Add((PyLongObject *)left_o, (PyLongObject *)right_o);
             PyStackRef_CLOSE_SPECIALIZED(right, (destructor)_PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, (destructor)PyObject_Free); // needs to be converted to freelist
+            PyStackRef_CLOSE_SPECIALIZED(left, (destructor)_PyLong_ExactDealloc);
             INPUTS_DEAD();
             ERROR_IF(res_o == NULL, error);
             res = PyStackRef_FromPyObjectSteal(res_o);
@@ -542,7 +542,7 @@ dummy_func(
             STAT_INC(BINARY_OP, hit);
             PyObject *res_o = _PyLong_Subtract((PyLongObject *)left_o, (PyLongObject *)right_o);
             PyStackRef_CLOSE_SPECIALIZED(right, (destructor)_PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, (destructor)PyObject_Free); // needs to be converted to freelist
+            PyStackRef_CLOSE_SPECIALIZED(left, (destructor)_PyLong_ExactDealloc);
             INPUTS_DEAD();
             ERROR_IF(res_o == NULL, error);
             res = PyStackRef_FromPyObjectSteal(res_o);

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h