Skip to content

[3.11] gh-93382: Cache result of PyCode_GetCode in codeobject (GH-93383) #93493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pablogsal merged 8 commits into from
Jun 23, 2022
Merged

[3.11] gh-93382: Cache result of PyCode_GetCode in codeobject (GH-93383) #93493

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
13642ce
gh-93382: Cache result of `PyCode_GetCode` in codeobject (GH-93383)
Fidget-Spinner Jun 3, 2022
0f9511f
Update test_frozenmain.h
Fidget-Spinner Jun 4, 2022
56b017d
Address Brandt's review
Fidget-Spinner Jun 5, 2022
5af4e76
Apply suggestions by Mark
Fidget-Spinner Jun 11, 2022
be1baad
Fix memory leak in deepfrozen code objects
Fidget-Spinner Jun 11, 2022
c979855
Merge remote-tracking branch 'upstream/3.11' into co_code_cached_back…
Fidget-Spinner Jun 22, 2022
887120f
add to deepfreeze.py
Fidget-Spinner Jun 22, 2022
b34659c
make regen-abidump
Fidget-Spinner Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add to deepfreeze.py
  • Loading branch information
@Fidget-Spinner
Fidget-Spinner committed Jun 22, 2022
commit 887120f6b6a4332db18260cc9b5f937e585a72ef
3 changes: 2 additions & 1 deletion Objects/codeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1431,7 +1431,8 @@ _PyCode_GetCode(PyCodeObject *co)
return NULL;
}
deopt_code((_Py_CODEUNIT *)PyBytes_AS_STRING(code), Py_SIZE(co));
Py_XSETREF(co->_co_code, Py_NewRef(code));
assert(co->_co_code == NULL);
Comment thread
Fidget-Spinner marked this conversation as resolved.
co->_co_code = Py_NewRef(code);
return code;
}

Expand Down
1 change: 1 addition & 0 deletions Tools/scripts/deepfreeze.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ def generate_code(self, name: str, code: types.CodeType) -> str:
self.write(f".co_name = {co_name},")
self.write(f".co_qualname = {co_qualname},")
self.write(f".co_linetable = {co_linetable},")
self.write(f"._co_code = NULL,")
self.write("._co_linearray = NULL,")
self.write(f".co_code_adaptive = {co_code_adaptive},")
name_as_code = f"(PyCodeObject *)&{name}"
Expand Down