languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-05 00:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Propagate errors (however unlikely) from _Py_Deepfreeze_Init() (GH-31596)

Browse source
This commit is contained in:
Kumar Aditya 2022-02-26 22:05:03 +05:30 committed by GitHub
parent edbee56d69
commit 0d9b565e62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Include/internal/pycore_code.h
View file

@ -317,7 +317,7 @@ extern void _Py_Specialize_UnpackSequence(PyObject *seq, _Py_CODEUNIT *instr,
/* Deallocator function for static codeobjects used in deepfreeze.py */
extern void _PyStaticCode_Dealloc(PyCodeObject *co);
/* Function to intern strings of codeobjects */
extern void _PyStaticCode_InternStrings(PyCodeObject *co);
extern int _PyStaticCode_InternStrings(PyCodeObject *co);
#ifdef Py_STATS

2
Include/internal/pycore_pylifecycle.h
View file

@ -65,7 +65,7 @@ extern PyStatus _Py_HashRandomization_Init(const PyConfig *);
extern PyStatus _PyImportZip_Init(PyThreadState *tstate);
extern PyStatus _PyGC_Init(PyInterpreterState *interp);
extern PyStatus _PyAtExit_Init(PyInterpreterState *interp);
extern void _Py_Deepfreeze_Init(void);
extern int _Py_Deepfreeze_Init(void);
/* Various internal finalizers */

16
Objects/codeobject.c
View file

@ -1931,14 +1931,20 @@ _PyStaticCode_Dealloc(PyCodeObject *co)
}
}
void
int
_PyStaticCode_InternStrings(PyCodeObject *co)
{
int res = intern_strings(co->co_names);
assert(res == 0);
if (res < 0) {
return -1;
}
res = intern_string_constants(co->co_consts, NULL);
assert(res == 0);
if (res < 0) {
return -1;
}
res = intern_strings(co->co_localsplusnames);
assert(res == 0);
(void)res;
if (res < 0) {
return -1;
}
return 0;
}

3
Programs/_bootstrap_python.c
View file

@ -15,8 +15,9 @@
/* End includes */
/* Empty initializer for deepfrozen modules */
void _Py_Deepfreeze_Init(void)
int _Py_Deepfreeze_Init(void)
{
return 0;
}
/* Empty finalizer for deepfrozen modules */
void

3
Programs/_freeze_module.c
View file

@ -23,8 +23,9 @@
#endif
/* Empty initializer for deepfrozen modules */
void _Py_Deepfreeze_Init(void)
int _Py_Deepfreeze_Init(void)
{
return 0;
}
/* Empty finalizer for deepfrozen modules */
void

4
Python/pylifecycle.c
View file

@ -828,7 +828,9 @@ pycore_interp_init(PyThreadState *tstate)
}
// Intern strings in deep-frozen modules first so that others
// can use it instead of creating a heap allocated string.
_Py_Deepfreeze_Init();
if (_Py_Deepfreeze_Init() < 0) {
return _PyStatus_ERR("failed to initialize deep-frozen modules");
}
status = pycore_init_types(interp);
if (_PyStatus_EXCEPTION(status)) {

8
Tools/scripts/deepfreeze.py
View file

@ -283,7 +283,7 @@ def generate_code(self, name: str, code: types.CodeType) -> str:
self.write(f".co_cellvars = {co_cellvars},")
self.write(f".co_freevars = {co_freevars},")
self.deallocs.append(f"_PyStaticCode_Dealloc(&{name});")
self.interns.append(f"_PyStaticCode_InternStrings(&{name});")
self.interns.append(f"_PyStaticCode_InternStrings(&{name})")
return f"& {name}.ob_base"
def generate_tuple(self, name: str, t: Tuple[object, ...]) -> str:
@ -450,9 +450,11 @@ def generate(args: list[str], output: TextIO) -> None:
with printer.block(f"void\n_Py_Deepfreeze_Fini(void)"):
for p in printer.deallocs:
printer.write(p)
with printer.block(f"void\n_Py_Deepfreeze_Init(void)"):
with printer.block(f"int\n_Py_Deepfreeze_Init(void)"):
for p in printer.interns:
printer.write(p)
with printer.block(f"if ({p} < 0)"):
printer.write("return -1;")
printer.write("return 0;")
if verbose:
print(f"Cache hits: {printer.hits}, misses: {printer.misses}")