Fix up merge

Author: markshannon

Include/internal/pycore_freelist.h

@@ -106,9 +106,7 @@ static inline void *
 _PyFreeList_PopMem(struct _Py_freelist *fl)
 {
     void *op = _PyFreeList_PopNoStats(fl);
-    if (op != NULL) {
-        OBJECT_STAT_INC(from_freelist);
-    }
+    OBJECT_STAT_INC_COND(from_freelist, op != NULL);
     return op;
 }
 

Include/internal/pycore_freelist_state.h

@@ -40,10 +40,6 @@ struct _Py_freelist {
     uint32_t available;
     // The maximum number of items this freelist is allowed to hold
     uint32_t capacity;
-    struct _Py_freelist ranges;
-    struct _Py_freelist range_iters;
-    struct _Py_freelist pycfunctionobject;
-    struct _Py_freelist pycmethodobject;
 };
 
 #ifdef __cplusplus

Include/internal/pycore_gc.h

@@ -357,6 +357,8 @@ extern void _PyGC_VisitObjectsWorldStopped(PyInterpreterState *interp,
                                            gcvisitobjects_t callback, void *arg);
 #endif
 
+PyAPI_FUNC(void) PyObject_GC_DelTstate(PyThreadState *tstate, PyObject *op, size_t presize, size_t size);
+
 #ifdef __cplusplus
 }
 #endif

Include/internal/pycore_interp.h

@@ -13,11 +13,6 @@ extern "C" {
 
 /* interpreter state */
 
-typedef PyObject *(*alloc_func)(PyTypeObject *tp, size_t presize, size_t size);
-typedef PyObject *(*free_func)(PyObject *);
-
-    alloc_func alloc;
-    free_func free;
 #define _PyInterpreterState_WHENCE_NOTSET -1
 #define _PyInterpreterState_WHENCE_UNKNOWN 0
 #define _PyInterpreterState_WHENCE_RUNTIME 1

Include/internal/pycore_interp_structs.h

@@ -15,6 +15,9 @@ extern "C" {
 #include "pycore_tstate.h"        // _PyThreadStateImpl
 #include "pycore_typedefs.h"      // _PyRuntimeState
 
+typedef PyObject *(*py_alloc_func)(PyTypeObject *tp, size_t presize, size_t size);
+typedef void (*py_free_func)(PyObject *obj, size_t presize);
+
 
 #define CODE_MAX_WATCHERS 8
 #define CONTEXT_MAX_WATCHERS 8
@@ -890,6 +893,8 @@ struct _is {
     // that allocated memory is gone.  See free_obmalloc_arenas() for
     // more comments.
     struct _obmalloc_state *obmalloc;
+    py_alloc_func alloc;
+    py_free_func free;
 
     PyObject *audit_hooks;
     PyType_WatchCallback type_watchers[TYPE_MAX_WATCHERS];

Include/internal/pycore_object_alloc.h

@@ -74,8 +74,7 @@ _PyObject_NewTstate(PyThreadState *ts, PyTypeObject *tp, size_t presize, size_t
     if (size <= SMALL_REQUEST_THRESHOLD) {
         int size_cls = (size - 1) >> ALIGNMENT_SHIFT;
         struct _Py_freelist *fl = &ts->interp->object_state.freelists.by_size[size_cls];
-        char *mem = _PyFreeList_Pop(fl);
-        PyObject *op = (PyObject *)
+        char *mem = _PyFreeList_PopMem(fl);
         if (mem != NULL) {
             PyObject *op = (PyObject *)(mem + presize);
             Py_SET_TYPE(op, tp);
@@ -108,7 +107,6 @@ _PyMem_FreeTstate(PyThreadState *ts, PyObject *obj, size_t presize, size_t size)
     }
     OBJECT_STAT_INC(frees);
     ts->interp->free(obj, presize);
-    _PyRuntime.allocators.standard.obj.free(_PyRuntime.allocators.standard.obj.ctx, mem);
 }
 
 static inline void

Include/internal/pycore_object_state.h

@@ -45,6 +45,10 @@ struct _Py_freelists {
     struct _Py_freelist object_stack_chunks;
     struct _Py_freelist unicode_writers;
     struct _Py_freelist pymethodobjects;
+    struct _Py_freelist pycfunctionobject;
+    struct _Py_freelist pycmethodobject;
+    struct _Py_freelist ranges;
+    struct _Py_freelist range_iters;
 };
 
 struct _py_object_state {

Objects/floatobject.c

@@ -132,10 +132,19 @@ PyFloat_FromDoubleTstate(PyThreadState *ts, double fval)
     return op;
 }
 
+PyObject *
+PyFloat_FromDouble(double fval)
 {
     return PyFloat_FromDoubleTstate(PyThreadState_GET(), fval);
 }
 
+_PyStackRef _PyFloat_FromDouble_ConsumeInputs(PyThreadState *ts, _PyStackRef left, _PyStackRef right, double value)
+{
+    PyStackRef_CLOSE_SPECIALIZED_TSTATE(ts, left, _PyFloat_ExactDealloc);
+    PyStackRef_CLOSE_SPECIALIZED_TSTATE(ts, right, _PyFloat_ExactDealloc);
+    return PyStackRef_FromPyObjectSteal(PyFloat_FromDoubleTstate(ts, value));
+}
+
 static PyObject *
 float_from_string_inner(const char *s, Py_ssize_t len, void *obj)
 {

Objects/listobject.c

@@ -564,6 +564,8 @@ list_dealloc(PyObject *self)
         op->ob_item = NULL;
     }
     if (PyList_CheckExact(op)) {
+        size_t presize = sizeof(PyGC_Head);
+        assert(presize == _PyType_PreHeaderSize(Py_TYPE(op)));
         PyObject_GC_DelTstate(tstate, self, sizeof(PyGC_Head), sizeof(PyListObject));
     }
     else {

Python/gc.c

@@ -2378,21 +2378,7 @@ void
 PyObject_GC_DelTstate(PyThreadState *tstate, PyObject *op, size_t presize, size_t size)
 {
     PyGC_Head *g = AS_GC(op);
-    if (_PyObject_GC_IS_TRACKED(op)) {
-        gc_list_remove(g);
-#ifdef Py_DEBUG
-        PyObject *exc = PyErr_GetRaisedException();
-        if (PyErr_WarnExplicitFormat(PyExc_ResourceWarning, "gc", 0,
-                                     "gc", NULL,
-                                     "Object of type %s is not untracked "
-                                     "before destruction",
-                                     Py_TYPE(op)->tp_name))
-        {
-            PyErr_FormatUnraisable("Exception ignored on object deallocation");
-        }
-        PyErr_SetRaisedException(exc);
-#endif
-    }
+    assert(!_PyObject_GC_IS_TRACKED(op));
     GCState *gcstate = &tstate->interp->gc;
     if (gcstate->young.count > 0) {
         gcstate->young.count--;