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

tiran · web-flow · commit 26b0482393a3 · 2022-01-27T19:32:12.000Z
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
@@ -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
 
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
@@ -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;
 }
diff --git a/Tools/scripts/deepfreeze.py b/Tools/scripts/deepfreeze.py
@@ -278,7 +278,7 @@ def generate_code(self, name: str, code: types.CodeType) -> str:
             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:

Original file line number	Diff line number	Diff line change
`@@ -1908,16 +1908,19 @@ _PyCode_ConstantKey(PyObject *op)`
`1908`	`1908`	`}`
`1909`	`1909`
`1910`	`1910`	`void`
`1911`		`-_PyStaticCode_Dealloc(PyCodeObject co, _Py_CODEUNIT firstinstr)`
	`1911`	`+_PyStaticCode_Dealloc(PyCodeObject *co)`
`1912`	`1912`	`{`
`1913`		`- PyMem_Free(co->co_quickened);`
`1914`		`- co->co_quickened = NULL;`
	`1913`	`+ if (co->co_quickened) {`
	`1914`	`+ PyMem_Free(co->co_quickened);`
	`1915`	`+ co->co_quickened = NULL;`
	`1916`	`+ _Py_QuickenedCount--;`
	`1917`	`+ }`
	`1918`	`+ co->co_warmup = QUICKENING_INITIAL_WARMUP_VALUE;`
`1915`	`1919`	`PyMem_Free(co->co_extra);`
`1916`	`1920`	`co->co_extra = NULL;`
`1917`		`- co->co_firstinstr = firstinstr;`
	`1921`	`+ co->co_firstinstr = (_Py_CODEUNIT *)PyBytes_AS_STRING(co->co_code);`
`1918`	`1922`	`if (co->co_weakreflist != NULL) {`
`1919`	`1923`	`PyObject_ClearWeakRefs((PyObject *)co);`
`1920`	`1924`	`co->co_weakreflist = NULL;`
`1921`	`1925`	`}`
`1922`		`- co->co_warmup = QUICKENING_INITIAL_WARMUP_VALUE;`
`1923`	`1926`	`}`