diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2014-05-23 09:46:03 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2014-05-23 09:46:03 (GMT) |
| commit | 9961405ed122c0f91b063f3237ad47278ae72f62 (patch) | |
| tree | c3cc6c2ed0312469a8b5bfe526a4bc8eb7f13750 /Python | |
| parent | e17de091012eb928c5734856eeaf2bb8f99e40c1 (diff) | |
| download | cpython-9961405ed122c0f91b063f3237ad47278ae72f62.zip cpython-9961405ed122c0f91b063f3237ad47278ae72f62.tar.gz cpython-9961405ed122c0f91b063f3237ad47278ae72f62.tar.bz2 | |
Issue #21523: Fix over-pessimistic computation of the stack effect of some opcodes in the compiler.
This also fixes a quadratic compilation time issue noticeable when compiling
code with a large number of "and" and "or" operators.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/compile.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Python/compile.c b/Python/compile.c index 9978eb3..69419ec 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -3856,12 +3856,16 @@ stackdepth_walk(struct compiler *c, basicblock *b, int depth, int maxdepth) 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) { + } + 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) + depth = depth - 1; maxdepth = stackdepth_walk(c, instr->i_target, target_depth, maxdepth); if (instr->i_opcode == JUMP_ABSOLUTE || |