Thanks to visit codestin.com
Credit goes to github.com

Skip to content

bpo-43846: Use less stack for large literals and calls #25403

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
markshannon merged 6 commits into from
Apr 15, 2021
Merged

bpo-43846: Use less stack for large literals and calls #25403

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67c7d87
Modify compiler to reduce stack consumption for large expressions.
markshannon Apr 14, 2021
a5afaad
Add more tests for stack usage.
markshannon Apr 14, 2021
8c3cc5c
Add NEWS item.
markshannon Apr 14, 2021
87b7b6d
Remove assertion and raise SystemError for truly excessive stack use.
markshannon Apr 14, 2021
a523a6e
Clarify comments for STACK_USE_GUIDELINE and MAX_ALLOWED_STACK_USE.
markshannon Apr 14, 2021
95feeb8
Clean up starunpack_helper. Make sure all tests against STACK_USE_GUI…
markshannon Apr 15, 2021
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
Remove assertion and raise SystemError for truly excessive stack use.
  • Loading branch information
@markshannon
markshannon committed Apr 14, 2021
commit 87b7b6d635d03cc762ef6033807171c8d7c515ea
19 changes: 18 additions & 1 deletion Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@
*/
#define STACK_USE_GUIDELINE 30

/* If we exceed this limit, it should
* be considered a compiler bug.
* Currently it should be impossible
* to exceed STACK_USE_GUIDELINE * 100,
* as 100 is the maximum parse depth.
* For performance reasons we will
* want to reduce this to a
* few hundred in the future.
*/
#define MAX_ALLOWED_STACK_USE (STACK_USE_GUIDELINE * 100)

#define IS_TOP_LEVEL_AWAIT(c) ( \
(c->c_flags->cf_flags & PyCF_ALLOW_TOP_LEVEL_AWAIT) \
&& (c->u->u_ste->ste_type == ModuleBlock))
Expand Down Expand Up @@ -6277,7 +6288,6 @@ stackdepth(struct compiler *c)
maxdepth = new_depth;
}
assert(depth >= 0); /* invalid code or bug in stackdepth() */
//assert(depth < 50); /* Needs fixing in compiler */
if (is_jump(instr)) {
effect = stack_effect(instr->i_opcode, instr->i_oparg, 1);
assert(effect != PY_INVALID_STACK_EFFECT);
Expand Down Expand Up @@ -6678,6 +6688,13 @@ makecode(struct compiler *c, struct assembler *a, PyObject *consts)
Py_DECREF(consts);
goto error;
}
if (maxdepth > MAX_ALLOWED_STACK_USE) {
PyErr_Format(PyExc_SystemError,
"excessive stack use: stack is %d deep",
maxdepth);
Py_DECREF(consts);
goto error;
}
co = PyCode_NewWithPosOnlyArgs(posonlyargcount+posorkeywordargcount,
posonlyargcount, kwonlyargcount, nlocals_int,
maxdepth, flags, a->a_bytecode, consts, names,
Expand Down