Compute initial value of code version during deepfreeze.

Author: markshannon

Include/internal/pycore_code.h

@@ -455,6 +455,8 @@ _PyCode_LineNumberFromArray(PyCodeObject *co, int index)
     }
 }
 
+extern uint32_t _Py_next_func_version;
+
 
 #ifdef __cplusplus
 }

Objects/codeobject.c

@@ -11,8 +11,6 @@
 #include "pycore_tuple.h"         // _PyTuple_ITEMS()
 #include "clinic/codeobject.c.h"
 
-extern uint32_t _Py_next_func_version;
-
 /******************
  * generic helpers
  ******************/

Objects/funcobject.c

@@ -3,12 +3,11 @@
 
 #include "Python.h"
 #include "pycore_ceval.h"         // _PyEval_BuiltinsFromGlobals()
+#include "pycore_code.h"          // _Py_next_func_version
 #include "pycore_object.h"        // _PyObject_GC_UNTRACK()
 #include "pycore_pyerrors.h"      // _PyErr_Occurred()
 #include "structmember.h"         // PyMemberDef
 
-uint32_t _Py_next_func_version = 10000; /* Leave plenty of space for deep frozen code objects */
-
 PyFunctionObject *
 _PyFunction_FromConstructor(PyFrameConstructor *constr)
 {

Programs/_bootstrap_python.c

@@ -14,6 +14,8 @@
 #include "Python/frozen_modules/importlib._bootstrap_external.h"
 /* End includes */
 
+uint32_t _Py_next_func_version = 1;
+
 /* Empty initializer for deepfrozen modules */
 int _Py_Deepfreeze_Init(void)
 {

Programs/_freeze_module.c

@@ -9,6 +9,7 @@
    Keep this file in sync with Programs/_freeze_module.py.
 */
 
+
 #include <Python.h>
 #include <marshal.h>
 #include "pycore_fileutils.h"     // _Py_stat_struct
@@ -22,6 +23,8 @@
 #include <unistd.h>
 #endif
 
+uint32_t _Py_next_func_version = 1;
+
 /* Empty initializer for deepfrozen modules */
 int _Py_Deepfreeze_Init(void)
 {

Tools/build/deepfreeze.py

@@ -472,6 +472,7 @@ def generate(args: list[str], output: TextIO) -> None:
             with printer.block(f"if ({p} < 0)"):
                 printer.write("return -1;")
         printer.write("return 0;")
+    printer.write(f"\nuint32_t _Py_next_func_version = {next_code_version};\n")
     if verbose:
         print(f"Cache hits: {printer.hits}, misses: {printer.misses}")