Skip to content

gh-87092: change assembler to use instruction sequence instead of CFG #103933

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
iritkatriel merged 5 commits into from
Apr 29, 2023
Merged

gh-87092: change assembler to use instruction sequence instead of CFG #103933

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a4b1924
gh-87092: assembler uses instruction sequence instead of CFG
iritkatriel Apr 27, 2023
5f87642
assemble.c doesn't need to include pycore_flowgraph.c
iritkatriel Apr 27, 2023
74a7b40
rename _PyCompilerExceptHandlerInfo --> _PyCompile_ExceptHandlerInfo
iritkatriel Apr 27, 2023
191cc32
rename _PyCompilerInstruction --> _PyCompile_Instruction
iritkatriel Apr 27, 2023
f51084e
move comment
iritkatriel Apr 27, 2023
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
move comment
  • Loading branch information
@iritkatriel
iritkatriel committed Apr 27, 2023
commit f51084ee879101ef67370493122ad49dbf7e5c3b
5 changes: 3 additions & 2 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6997,12 +6997,13 @@ optimize_and_assemble_code_unit(struct compiler_unit *u, PyObject *const_cache,
if (_PyCfg_ResolveJumps(&g) < 0) {
goto error;
}

/* Can't modify the bytecode after computing jump offsets. */

if (cfg_to_instr_sequence(&g, &optimized_instrs) < 0) {
goto error;
}

/* Can't modify the bytecode after computing jump offsets. */

co = _PyAssemble_MakeCodeObject(&u->u_metadata, const_cache, consts,
maxdepth, &optimized_instrs, nlocalsplus,
code_flags, filename);
Expand Down