Skip to content

[WIP] bpo-17611: Move unwinding of stack from interpreter to compiler #2827

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
pitrou wants to merge 20 commits into from
Closed

[WIP] bpo-17611: Move unwinding of stack from interpreter to compiler #2827

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
656e4f3
bpo-17611: Move unwinding of stack from interpreter to compiler
pitrou Jul 23, 2017
c8068ab
Cleanup
pitrou Jul 23, 2017
b699364
Improve stack size calculation for SETUP_{EXCEPT,FINALLY}
pitrou Jul 23, 2017
541e7ce
Update frozen importlib
pitrou Jul 23, 2017
d3dc002
Remove useless code
pitrou Jul 23, 2017
b6d597c
Don't predict FOR_ITER as it breaks tracing without computed gotos
pitrou Jul 23, 2017
31e46dc
Remove dead code and fix tracing tests
pitrou Jul 23, 2017
693b939
Fix test_dis
pitrou Jul 23, 2017
d6ca2b9
Add JUMP_FINALLY to avoid finally block duplication
pitrou Jul 24, 2017
aefdbd1
Remove finally block duplication
pitrou Jul 24, 2017
9d12612
More precise computation of code object stack size
pitrou Jul 24, 2017
4ce87b6
JUMP_FINALLY pushes 6 values to be consistent with the effect of an e…
pitrou Jul 24, 2017
029f825
Exact stack size computation by popping stale exception state in RERAISE
pitrou Jul 24, 2017
bd0167f
Remove the now pointless POP_MANY
pitrou Jul 24, 2017
e5c1db6
Add comment for RERAISE
pitrou Jul 24, 2017
0ec9d12
Remove JUMP_FINALLY
pitrou Jul 24, 2017
9c3cfd0
Remove last block duplication
pitrou Jul 24, 2017
9a420d1
Get rid of END_ITER
pitrou Jul 24, 2017
336808c
Fix comments in frameobject.c
pitrou Jul 24, 2017
61ee3fa
Add stack size tests
pitrou Jul 29, 2017
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
Improve stack size calculation for SETUP_{EXCEPT,FINALLY}
  • Loading branch information
@pitrou
pitrou committed Jul 23, 2017
commit b699364d229c64956d323ae408546ebdc866e979
2 changes: 1 addition & 1 deletion Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3163,7 +3163,6 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
TARGET(WITH_EXCEPT_FINISH) {
PyObject *res = POP();
PyObject *exc = POP();
PyObject *val, *tb;
int err;

if (exc != Py_None)
Expand Down Expand Up @@ -3191,6 +3190,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
DISPATCH();
}
else {
PyObject *val, *tb;
assert(TOP() == exc);
STACKADJ(-1);
val = POP();
Expand Down
15 changes: 7 additions & 8 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5158,8 +5158,11 @@ stackdepth_walk(struct compiler *c, basicblock *b, int depth, int maxdepth)
{
int i, target_depth, effect;
struct instr *instr;
if (b->b_seen || b->b_startdepth >= depth)

if (b->b_seen || b->b_startdepth >= depth) {
return maxdepth;
}
/* Guard against infinite recursion */
b->b_seen = 1;
b->b_startdepth = depth;
for (i = 0; i < b->b_iused; i++) {
Expand All @@ -5175,19 +5178,15 @@ stackdepth_walk(struct compiler *c, basicblock *b, int depth, int maxdepth)
maxdepth = depth;
assert(depth >= 0); /* invalid code or bug in stackdepth() */
if (instr->i_jrel || instr->i_jabs) {
/* Recursively inspect jump target */
target_depth = depth;
if (instr->i_opcode == FOR_ITER) {
target_depth = depth-2;
}
else if (instr->i_opcode == SETUP_FINALLY ||
instr->i_opcode == SETUP_EXCEPT) {
target_depth = depth+3;
if (target_depth > maxdepth)
maxdepth = target_depth;
}
else if (instr->i_opcode == JUMP_IF_TRUE_OR_POP ||
instr->i_opcode == JUMP_IF_FALSE_OR_POP)
instr->i_opcode == JUMP_IF_FALSE_OR_POP) {
depth = depth - 1;
}
maxdepth = stackdepth_walk(c, instr->i_target,
target_depth, maxdepth);
if (instr->i_opcode == JUMP_ABSOLUTE ||
Expand Down