Fix refleaks tests to account for quickened blocks

Author: markshannon

Include/internal/pycore_code.h

@@ -148,6 +148,7 @@ PyCodeObject_IsWarmedUp(PyCodeObject * co)
 
 int _Py_Quicken(PyCodeObject *code);
 
+extern Py_ssize_t _Py_QuickenedCount;
 
 struct _PyCodeConstructor {
     /* metadata */

Lib/test/libregrtest/refleak.py

@@ -73,9 +73,10 @@ def get_pooled_int(value):
     alloc_deltas = [0] * repcount
     fd_deltas = [0] * repcount
     getallocatedblocks = sys.getallocatedblocks
+    getallocatedblocks = sys.getallocatedblocks
     gettotalrefcount = sys.gettotalrefcount
+    _getquickenedcount = sys._getquickenedcount
     fd_count = os_helper.fd_count
-
     # initialize variables to make pyflakes quiet
     rc_before = alloc_before = fd_before = 0
 
@@ -92,7 +93,7 @@ def get_pooled_int(value):
 
         # dash_R_cleanup() ends with collecting cyclic trash:
         # read memory statistics immediately after.
-        alloc_after = getallocatedblocks()
+        alloc_after = getallocatedblocks() - _getquickenedcount()
         rc_after = gettotalrefcount()
         fd_after = fd_count()
 

Objects/codeobject.c

@@ -1045,6 +1045,7 @@ code_dealloc(PyCodeObject *co)
         PyObject_ClearWeakRefs((PyObject*)co);
     if (co->co_quickened) {
         PyMem_Free(co->co_quickened);
+        _Py_QuickenedCount--;
     }
     PyObject_Free(co);
 }

Python/clinic/sysmodule.c.h

@@ -28,6 +28,8 @@
  <instr N-1>
 */
 
+Py_ssize_t _Py_QuickenedCount = 0;
+
 static SpecializedCacheOrInstruction *
 allocate(int cache_count, int instruction_count)
 {
@@ -42,6 +44,7 @@ allocate(int cache_count, int instruction_count)
         PyErr_NoMemory();
         return NULL;
     }
+    _Py_QuickenedCount++;
     array[0].entry.zero.cache_count = cache_count;
     return array;
 }

Python/specialize.c

@@ -18,6 +18,7 @@ Data members:
 #include "pycore_ceval.h"         // _Py_RecursionLimitLowerWaterMark()
 #include "pycore_initconfig.h"    // _PyStatus_EXCEPTION()
 #include "pycore_object.h"        // _PyObject_IS_GC()
+#include "pycore_code.h"          // _Py_QuickenedCount
 #include "pycore_pathconfig.h"    // _PyPathConfig_ComputeSysPath0()
 #include "pycore_pyerrors.h"      // _PyErr_Fetch()
 #include "pycore_pylifecycle.h"   // _PyErr_WriteUnraisableDefaultHook()
@@ -1763,8 +1764,20 @@ sys_gettotalrefcount_impl(PyObject *module)
 {
     return _Py_GetRefTotal();
 }
+
 #endif /* Py_REF_DEBUG */
 
+/*[clinic input]
+sys._getquickenedcount -> Py_ssize_t
+[clinic start generated code]*/
+
+static Py_ssize_t
+sys__getquickenedcount_impl(PyObject *module)
+/*[clinic end generated code: output=1ab259e7f91248a2 input=249d448159eca912]*/
+{
+    return _Py_QuickenedCount;
+}
+
 /*[clinic input]
 sys.getallocatedblocks -> Py_ssize_t
 
@@ -1995,6 +2008,7 @@ static PyMethodDef sys_methods[] = {
 #endif
     SYS_GETFILESYSTEMENCODING_METHODDEF
     SYS_GETFILESYSTEMENCODEERRORS_METHODDEF
+    SYS__GETQUICKENEDCOUNT_METHODDEF
 #ifdef Py_TRACE_REFS
     {"getobjects",      _Py_GetObjects, METH_VARARGS},
 #endif