Skip to content

gh-87092: move assembler related code from compile.c to assemble.c #103277

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 10 commits into from
Apr 11, 2023
Merged

gh-87092: move assembler related code from compile.c to assemble.c #103277

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d01b033
resolve_line_numbers as part of cfg-opt
iritkatriel Apr 1, 2023
1abb2c4
remove unnecessary comment
iritkatriel Apr 3, 2023
5d8b1c0
split _PyCompile_CodeUnitMetadata out of compiler_unit
iritkatriel Apr 3, 2023
3e0e84f
add assemble.c
iritkatriel Apr 4, 2023
cb6afda
Merge branch 'main' into cfg
iritkatriel Apr 5, 2023
cff3d58
typo
iritkatriel Apr 5, 2023
4c128fe
Merge branch 'main' into cfg
iritkatriel Apr 10, 2023
d0b8bc2
assemble --> assemble_and_optimize. Update comment at top of file
iritkatriel Apr 10, 2023
1aa506b
update comment
iritkatriel Apr 10, 2023
c931648
Merge branch 'main' into cfg
iritkatriel Apr 11, 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
Next Next commit
assemble --> assemble_and_optimize. Update comment at top of file
  • Loading branch information
@iritkatriel
iritkatriel committed Apr 10, 2023
commit d0b8bc269fe46bda5414532539e22d734a4d47af
30 changes: 15 additions & 15 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
* object:
* 1. Checks for future statements. See future.c
* 2. Builds a symbol table. See symtable.c.
* 3. Generate code for basic blocks. See compiler_mod() in this file.
* 4. Assemble the basic blocks into final code. See assemble() in
* this file.
* 5. Optimize the byte code (peephole optimizations).
* 3. Generate an instruction sequence. See compiler_mod() in this file.
* 4. Generate a control flow graph and run optimizations on it. See flowgraph.c.
* 5. Assemble the basic blocks into final code. See optimize_and_assemble() in
* this file, and assembler.c.
*
* Note that compiler_mod() suggests module, but the module ast type
* (mod_ty) has cases for expressions and interactive statements.
Expand Down Expand Up @@ -488,7 +488,7 @@ static int compiler_match(struct compiler *, stmt_ty);
static int compiler_pattern_subpattern(struct compiler *,
pattern_ty, pattern_context *);

static PyCodeObject *assemble(struct compiler *, int addNone);
static PyCodeObject *optimize_and_assemble(struct compiler *, int addNone);

#define CAPSULE_NAME "compile.c compiler unit"

Expand Down Expand Up @@ -1592,7 +1592,7 @@ compiler_body(struct compiler *c, location loc, asdl_stmt_seq *stmts)
/* Set current line number to the line number of first statement.
This way line number for SETUP_ANNOTATIONS will always
coincide with the line number of first "real" statement in module.
If body is empty, then lineno will be set later in assemble. */
If body is empty, then lineno will be set later in optimize_and_assemble. */
if (c->u->u_scope_type == COMPILER_SCOPE_MODULE && asdl_seq_LEN(stmts)) {
st = (stmt_ty)asdl_seq_GET(stmts, 0);
loc = LOC(st);
Expand Down Expand Up @@ -1663,7 +1663,7 @@ compiler_mod(struct compiler *c, mod_ty mod)
if (compiler_codegen(c, mod) < 0) {
return NULL;
}
PyCodeObject *co = assemble(c, addNone);
PyCodeObject *co = optimize_and_assemble(c, addNone);
compiler_exit_scope(c);
return co;
}
Expand Down Expand Up @@ -2124,7 +2124,7 @@ compiler_function(struct compiler *c, stmt_ty s, int is_async)
return ERROR;
}
}
co = assemble(c, 1);
co = optimize_and_assemble(c, 1);
compiler_exit_scope(c);
if (co == NULL) {
Py_XDECREF(co);
Expand Down Expand Up @@ -2219,7 +2219,7 @@ compiler_class(struct compiler *c, stmt_ty s)
}
ADDOP_IN_SCOPE(c, NO_LOCATION, RETURN_VALUE);
/* create the code object */
co = assemble(c, 1);
co = optimize_and_assemble(c, 1);
}
/* leave the new scope */
compiler_exit_scope(c);
Expand Down Expand Up @@ -2491,12 +2491,12 @@ compiler_lambda(struct compiler *c, expr_ty e)
c->u->u_metadata.u_kwonlyargcount = asdl_seq_LEN(args->kwonlyargs);
VISIT_IN_SCOPE(c, expr, e->v.Lambda.body);
if (c->u->u_ste->ste_generator) {
co = assemble(c, 0);
co = optimize_and_assemble(c, 0);
}
else {
location loc = LOCATION(e->lineno, e->lineno, 0, 0);
ADDOP_IN_SCOPE(c, loc, RETURN_VALUE);
co = assemble(c, 1);
co = optimize_and_assemble(c, 1);
}
compiler_exit_scope(c);
if (co == NULL) {
Expand Down Expand Up @@ -4894,7 +4894,7 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
}
}

co = assemble(c, 1);
co = optimize_and_assemble(c, 1);
compiler_exit_scope(c);
if (is_top_level_await && is_async_generator){
c->u->u_ste->ste_coroutine = 1;
Expand Down Expand Up @@ -6805,7 +6805,7 @@ add_return_at_end(struct compiler *c, int addNone)
static int cfg_to_instr_sequence(cfg_builder *g, instr_sequence *seq);

static PyCodeObject *
assemble_code_unit(struct compiler_unit *u, PyObject *const_cache,
optimize_and_assemble_code_unit(struct compiler_unit *u, PyObject *const_cache,
int code_flags, PyObject *filename)
{
instr_sequence optimized_instrs;
Expand Down Expand Up @@ -6869,7 +6869,7 @@ assemble_code_unit(struct compiler_unit *u, PyObject *const_cache,
}

static PyCodeObject *
assemble(struct compiler *c, int addNone)
optimize_and_assemble(struct compiler *c, int addNone)
{
struct compiler_unit *u = c->u;
PyObject *const_cache = c->c_const_cache;
Expand All @@ -6884,7 +6884,7 @@ assemble(struct compiler *c, int addNone)
return NULL;
}

return assemble_code_unit(u, const_cache, code_flags, filename);
return optimize_and_assemble_code_unit(u, const_cache, code_flags, filename);
}

static int
Expand Down