Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-46476: Simplify and fix _PyStaticCode_Dealloc (GH-30965)

This commit is contained in:
Christian Heimes 2022-01-27 21:32:12 +02:00 committed by GitHub
parent 247480a21c
commit 26b0482393
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Include/internal/pycore_code.h
View File

@ -277,7 +277,7 @@ void _Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr,
void _Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr, SpecializedCacheEntry *cache);
/* Deallocator function for static codeobjects used in deepfreeze.py */
void _PyStaticCode_Dealloc(PyCodeObject *co, _Py_CODEUNIT *firstinstr);
void _PyStaticCode_Dealloc(PyCodeObject *co);
#ifdef Py_STATS

13
Objects/codeobject.c
View File

@ -1908,16 +1908,19 @@ _PyCode_ConstantKey(PyObject *op)
}
void
_PyStaticCode_Dealloc(PyCodeObject *co, _Py_CODEUNIT *firstinstr)
_PyStaticCode_Dealloc(PyCodeObject *co)
{
PyMem_Free(co->co_quickened);
co->co_quickened = NULL;
if (co->co_quickened) {
PyMem_Free(co->co_quickened);
co->co_quickened = NULL;
_Py_QuickenedCount--;
}
co->co_warmup = QUICKENING_INITIAL_WARMUP_VALUE;
PyMem_Free(co->co_extra);
co->co_extra = NULL;
co->co_firstinstr = firstinstr;
co->co_firstinstr = (_Py_CODEUNIT *)PyBytes_AS_STRING(co->co_code);
if (co->co_weakreflist != NULL) {
PyObject_ClearWeakRefs((PyObject *)co);
co->co_weakreflist = NULL;
}
co->co_warmup = QUICKENING_INITIAL_WARMUP_VALUE;
}

2
Tools/scripts/deepfreeze.py
View File

@ -278,7 +278,7 @@ class Printer:
self.write(f".co_varnames = {co_varnames},")
self.write(f".co_cellvars = {co_cellvars},")
self.write(f".co_freevars = {co_freevars},")
self.deallocs.append(f"_PyStaticCode_Dealloc(&{name}, (_Py_CODEUNIT *) {removesuffix(co_code, '.ob_base.ob_base')}.ob_sval);")
self.deallocs.append(f"_PyStaticCode_Dealloc(&{name});")
return f"& {name}.ob_base"
def generate_tuple(self, name: str, t: Tuple[object, ...]) -> str: