Use flags for speed. Still not working

Author: markshannon

Include/internal/pycore_freelist.h

@@ -38,8 +38,8 @@ _Py_freelists_GET(void)
     _PyFreeList_Push(&_Py_freelists_GET()->NAME, _PyObject_CAST(op), limit)
 
 // Pops a PyObject from the freelist, returns NULL if the freelist is empty.
-#define _Py_FREELIST_POP(TYPE, NAME) \
-    _Py_CAST(TYPE*, _PyFreeList_Pop(&_Py_freelists_GET()->NAME))
+#define _Py_FREELIST_POP(TYPE, NAME, IS_GC) \
+    _Py_CAST(TYPE*, _PyFreeList_Pop(&_Py_freelists_GET()->NAME, (IS_GC) ? _Py_GC_OBJECT : 0))
 
 // Pops a non-PyObject data structure from the freelist, returns NULL if the
 // freelist is empty.
@@ -83,12 +83,13 @@ _PyFreeList_PopNoStats(struct _Py_freelist *fl)
 }
 
 static inline PyObject *
-_PyFreeList_Pop(struct _Py_freelist *fl)
+_PyFreeList_Pop(struct _Py_freelist *fl, int flags)
 {
     PyObject *op = _PyFreeList_PopNoStats(fl);
     if (op != NULL) {
         OBJECT_STAT_INC(from_freelist);
         _Py_NewReference(op);
+        op->ob_flags = flags;
     }
     return op;
 }

Include/internal/pycore_gc.h

@@ -74,8 +74,7 @@ static inline int _PyObject_GC_IS_TRACKED(PyObject *op) {
 #ifdef Py_GIL_DISABLED
     return _PyObject_HAS_GC_BITS(op, _PyGC_BITS_TRACKED);
 #else
-    PyGC_Head *gc = _Py_AS_GC(op);
-    return (gc->_gc_next != 0);
+    return (op->ob_flags & _Py_GC_TRACKED) != 0;
 #endif
 }
 #define _PyObject_GC_IS_TRACKED(op) _PyObject_GC_IS_TRACKED(_Py_CAST(PyObject*, op))
@@ -232,6 +231,8 @@ static inline void _PyObject_GC_TRACK(
     gc->_gc_next = ((uintptr_t)live);
     live->_gc_prev = (uintptr_t)gc;
     assert((gc->_gc_next & 1) == 0);
+    assert(op->ob_flags & _Py_GC_OBJECT);
+    op->ob_flags |= _Py_GC_TRACKED;
 #endif
 }
 
@@ -266,6 +267,7 @@ static inline void _PyObject_GC_UNTRACK(
     _PyGCHead_SET_PREV(next, prev);
     gc->_gc_next = 0;
     gc->_gc_prev &= _PyGC_PREV_MASK_FINALIZED;
+    op->ob_flags &= ~_Py_GC_TRACKED;
 #endif
 }
 

Include/internal/pycore_object.h

@@ -438,7 +438,7 @@ _Py_DECREF_CODE(PyCodeObject *co)
 
 extern void _Py_CandidateCycleRoot(PyObject *op);
 
-static inline void Py_DECREF_MORTAL(const char *filename, int lineno, PyObject *op)
+static inline void Py_DecrefMortal(const char *filename, int lineno, PyObject *op)
 {
     if (op->ob_refcnt <= 0) {
         _Py_NegativeRefcount(filename, lineno, op);
@@ -451,11 +451,13 @@ static inline void Py_DECREF_MORTAL(const char *filename, int lineno, PyObject *
     if (--op->ob_refcnt == 0) {
         _Py_Dealloc(op);
     }
-    else if (PyObject_GC_IsTracked(op)) {
-        _Py_CandidateCycleRoot(op);
+    else {
+        if (PyObject_GC_IsTracked(op)) {
+            _Py_CandidateCycleRoot(op);
+        }
     }
 }
-#define Py_DECREF_MORTAL(op) Py_DECREF_MORTAL(__FILE__, __LINE__, _PyObject_CAST(op))
+#define Py_DECREF_MORTAL(op) Py_DecrefMortal(__FILE__, __LINE__, _PyObject_CAST(op))
 
 static inline void _Py_DECREF_MORTAL_SPECIALIZED(const char *filename, int lineno, PyObject *op, destructor destruct)
 {
@@ -486,6 +488,7 @@ extern Py_NO_INLINE PyAPI_FUNC(void) Py_DECREF_MORTAL(PyObject *op);
 static inline void Py_DECREF_MORTAL_SPECIALIZED(PyObject *op, destructor destruct)
 {
     assert(!_Py_IsStaticImmortal(op));
+    assert(!PyObject_GC_IsTracked(op));
     _Py_DECREF_STAT_INC();
     if (--op->ob_refcnt == 0) {
         _PyReftracerTrack(op, PyRefTracer_DESTROY);
@@ -852,9 +855,7 @@ _PyObject_GET_WEAKREFS_LISTPTR_FROM_OFFSET(PyObject *op)
 static inline int
 _PyObject_IS_GC(PyObject *obj)
 {
-    PyTypeObject *type = Py_TYPE(obj);
-    return (_PyType_IS_GC(type)
-            && (type->tp_is_gc == NULL || type->tp_is_gc(obj)));
+    return (obj->ob_flags & _Py_GC_OBJECT) != 0;
 }
 
 // Fast inlined version of PyObject_Hash()

Include/refcount.h

@@ -246,6 +246,7 @@ PyAPI_FUNC(void) _Py_DecRef(PyObject *);
 
 static inline Py_ALWAYS_INLINE void Py_INCREF(PyObject *op)
 {
+    assert((op->ob_flags & (_Py_GC_OBJECT | _Py_GC_TRACKED)) != _Py_GC_TRACKED);
 #if defined(Py_LIMITED_API) && (Py_LIMITED_API+0 >= 0x030c0000 || defined(Py_REF_DEBUG))
     // Stable ABI implements Py_INCREF() as a function call on limited C API
     // version 3.12 and newer, and on Python built in debug mode. _Py_IncRef()

Modules/_asynciomodule.c

@@ -2052,7 +2052,7 @@ future_new_iter(PyObject *fut)
     asyncio_state *state = get_asyncio_state_by_def((PyObject *)fut);
     ENSURE_FUTURE_ALIVE(state, fut)
 
-    it = _Py_FREELIST_POP(futureiterobject, futureiters);
+    it = _Py_FREELIST_POP(futureiterobject, futureiters, 1);
     if (it == NULL) {
         it = PyObject_GC_New(futureiterobject, state->FutureIterType);
         if (it == NULL) {

Objects/classobject.c

@@ -114,7 +114,7 @@ PyMethod_New(PyObject *func, PyObject *self)
         PyErr_BadInternalCall();
         return NULL;
     }
-    PyMethodObject *im = _Py_FREELIST_POP(PyMethodObject, pymethodobjects);
+    PyMethodObject *im = _Py_FREELIST_POP(PyMethodObject, pymethodobjects, 1);
     if (im == NULL) {
         im = PyObject_GC_New(PyMethodObject, &PyMethod_Type);
         if (im == NULL) {

Objects/complexobject.c

@@ -410,7 +410,7 @@ complex_subtype_from_c_complex(PyTypeObject *type, Py_complex cval)
 PyObject *
 PyComplex_FromCComplex(Py_complex cval)
 {
-    PyComplexObject *op = _Py_FREELIST_POP(PyComplexObject, complexes);
+    PyComplexObject *op = _Py_FREELIST_POP(PyComplexObject, complexes, 0);
 
     if (op == NULL) {
         /* Inline PyObject_New */

Objects/dictobject.c

@@ -872,7 +872,7 @@ new_dict(PyInterpreterState *interp,
          Py_ssize_t used, int free_values_on_failure)
 {
     assert(keys != NULL);
-    PyDictObject *mp = _Py_FREELIST_POP(PyDictObject, dicts);
+    PyDictObject *mp = _Py_FREELIST_POP(PyDictObject, dicts, 1);
     if (mp == NULL) {
         mp = PyObject_GC_New(PyDictObject, &PyDict_Type);
         if (mp == NULL) {

Objects/exceptions.c

@@ -3978,6 +3978,7 @@ get_memory_error(int allow_allocation, PyObject *args, PyObject *kwds)
         self->dict = NULL;
         self->args = (PyObject *)&_Py_SINGLETON(tuple_empty);
         _Py_NewReference((PyObject *)self);
+        ((PyObject *)self)->ob_flags = _Py_GC_OBJECT;
         _PyObject_GC_TRACK(self);
     }
     MEMERRORS_UNLOCK(state);

Objects/floatobject.c

@@ -123,7 +123,7 @@ PyFloat_GetInfo(void)
 PyObject *
 PyFloat_FromDouble(double fval)
 {
-    PyFloatObject *op = _Py_FREELIST_POP(PyFloatObject, floats);
+    PyFloatObject *op = _Py_FREELIST_POP(PyFloatObject, floats, 0);
     if (op == NULL) {
         op = PyObject_Malloc(sizeof(PyFloatObject));
         if (!op) {