diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2014-05-23 11:46:03 +0200 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2014-05-23 11:46:03 +0200 |
| commit | 5fee46c5717b4d9d86cdbe10252195a1989d4313 (patch) | |
| tree | 92bf9335a1673c894e3b0ddc6878b270d942d55f /Python/compile.c | |
| parent | 7b944695219ded9708ab1c157746f60054aec8af (diff) | |
| download | cpython-5fee46c5717b4d9d86cdbe10252195a1989d4313.tar.gz | |
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/compile.c')
| -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 9978eb3a1d..69419ecddc 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 || |