Skip to content

GH-99554: marshal bytecode more efficiently #99555

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

Closed
brandtbucher wants to merge 9 commits into from
Closed

GH-99554: marshal bytecode more efficiently #99555

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4034318
Compress marshalled bytecode
brandtbucher Nov 15, 2022
8b6b393
blurb add
brandtbucher Nov 16, 2022
5f81b82
Add opcode_for_build
brandtbucher Nov 16, 2022
e34c460
Catch up with main
brandtbucher Dec 15, 2022
23ba802
fixup
brandtbucher Dec 15, 2022
6ed83af
Catch up with main
brandtbucher Dec 17, 2022
5534112
Address review comments
brandtbucher Dec 17, 2022
ead8f26
Catch up with main
brandtbucher Dec 17, 2022
bcd7980
Terminate the compressed bytecode with two zeros
brandtbucher Dec 18, 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
fixup
  • Loading branch information
@brandtbucher
brandtbucher committed Dec 15, 2022
commit 23ba802a35d64907f293b4fb0c98b8c20d673b5e
6 changes: 4 additions & 2 deletions Python/marshal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,9 +971,11 @@ r_bytecode(RFILE *p)
}
assert(0x00 <= opcode && opcode < 0x100);
assert(0x00 <= oparg && oparg < 0x100);
buffer[i++] = _Py_MAKECODEUNIT(opcode, oparg);
buffer[i].opcode = opcode;
buffer[i++].oparg = oparg;
for (int j = 0; j < _PyOpcode_Caches[opcode]; j++) {
buffer[i++] = _Py_MAKECODEUNIT(CACHE, oparg);
buffer[i].opcode = CACHE;
buffer[i++].oparg = 0;
Comment on lines 344 to
Copy link
Copy Markdown
Member

@gvanrossum gvanrossum Dec 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly I'd rather see the i++ on separate lines instead of this hybrid approach.

}
}
if (i != size) {
Expand Down