Skip to content

gh-87092: move all localsplus preparation into separate function called from assembler stage #99869

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
merged 2 commits into from
Nov 30, 2022
Merged

gh-87092: move all localsplus preparation into separate function called from assembler stage #99869

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d69bec
move all localsplus stuff to assembly stage
iritkatriel Nov 17, 2022
898ddef
move all localsplus stuff into separate function
iritkatriel Nov 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
71 changes: 41 additions & 30 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8730,6 +8730,41 @@ remove_redundant_jumps(cfg_builder *g) {
return 0;
}

static int
prepare_localsplus(struct compiler* c, int code_flags)
{
assert(PyDict_GET_SIZE(c->u->u_varnames) < INT_MAX);
assert(PyDict_GET_SIZE(c->u->u_cellvars) < INT_MAX);
assert(PyDict_GET_SIZE(c->u->u_freevars) < INT_MAX);
int nlocals = (int)PyDict_GET_SIZE(c->u->u_varnames);
int ncellvars = (int)PyDict_GET_SIZE(c->u->u_cellvars);
int nfreevars = (int)PyDict_GET_SIZE(c->u->u_freevars);
assert(INT_MAX - nlocals - ncellvars > 0);
assert(INT_MAX - nlocals - ncellvars - nfreevars > 0);
int nlocalsplus = nlocals + ncellvars + nfreevars;
int* cellfixedoffsets = build_cellfixedoffsets(c);
if (cellfixedoffsets == NULL) {
return -1;
}

cfg_builder* g = CFG_BUILDER(c);

// This must be called before fix_cell_offsets().
if (insert_prefix_instructions(c, g->g_entryblock, cellfixedoffsets, nfreevars, code_flags)) {
PyMem_Free(cellfixedoffsets);
return -1;
}

int numdropped = fix_cell_offsets(c, g->g_entryblock, cellfixedoffsets);
PyMem_Free(cellfixedoffsets); // At this point we're done with it.
cellfixedoffsets = NULL;
if (numdropped < 0) {
return -1;
}
nlocalsplus -= numdropped;
return nlocalsplus;
}

static PyCodeObject *
assemble(struct compiler *c, int addNone)
{
Expand All @@ -8751,20 +8786,6 @@ assemble(struct compiler *c, int addNone)
ADDOP(c, NO_LOCATION, RETURN_VALUE);
}

assert(PyDict_GET_SIZE(c->u->u_varnames) < INT_MAX);
assert(PyDict_GET_SIZE(c->u->u_cellvars) < INT_MAX);
assert(PyDict_GET_SIZE(c->u->u_freevars) < INT_MAX);
int nlocals = (int)PyDict_GET_SIZE(c->u->u_varnames);
int ncellvars = (int)PyDict_GET_SIZE(c->u->u_cellvars);
int nfreevars = (int)PyDict_GET_SIZE(c->u->u_freevars);
assert(INT_MAX - nlocals - ncellvars > 0);
assert(INT_MAX - nlocals - ncellvars - nfreevars > 0);
int nlocalsplus = nlocals + ncellvars + nfreevars;
int *cellfixedoffsets = build_cellfixedoffsets(c);
if (cellfixedoffsets == NULL) {
goto error;
}

int nblocks = 0;
for (basicblock *b = CFG_BUILDER(c)->g_block_list; b != NULL; b = b->b_list) {
nblocks++;
Expand All @@ -8787,19 +8808,6 @@ assemble(struct compiler *c, int addNone)
}
}

// This must be called before fix_cell_offsets().
if (insert_prefix_instructions(c, g->g_entryblock, cellfixedoffsets, nfreevars, code_flags)) {
goto error;
}

int numdropped = fix_cell_offsets(c, g->g_entryblock, cellfixedoffsets);
PyMem_Free(cellfixedoffsets); // At this point we're done with it.
cellfixedoffsets = NULL;
if (numdropped < 0) {
goto error;
}
nlocalsplus -= numdropped;

/** Preprocessing **/
/* Map labels to targets and mark exception handlers */
if (translate_jump_labels_to_targets(g->g_entryblock)) {
Expand Down Expand Up @@ -8839,6 +8847,12 @@ assemble(struct compiler *c, int addNone)
}

/** Assembly **/

int nlocalsplus = prepare_localsplus(c, code_flags);
if (nlocalsplus < 0) {
goto error;
}

int maxdepth = stackdepth(g->g_entryblock, code_flags);
if (maxdepth < 0) {
goto error;
Expand Down Expand Up @@ -8904,9 +8918,6 @@ assemble(struct compiler *c, int addNone)
error:
Py_XDECREF(consts);
assemble_free(&a);
if (cellfixedoffsets != NULL) {
PyMem_Free(cellfixedoffsets);
}
return co;
}

Expand Down