diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-06-15 15:22:08 (GMT) |
|---|---|---|
| committer | Pablo Galindo <Pablogsal@gmail.com> | 2019-06-15 15:22:08 (GMT) |
| commit | 284daeade210d3aac049f4278a1fb76d19e6d78a (patch) | |
| tree | b91952973efc296d621b73baf2e6860e85ec95c9 /Python | |
| parent | 687af44df8caa69312b65d1bd7bf1f05dd1e5778 (diff) | |
| download | cpython-284daeade210d3aac049f4278a1fb76d19e6d78a.zip cpython-284daeade210d3aac049f4278a1fb76d19e6d78a.tar.gz cpython-284daeade210d3aac049f4278a1fb76d19e6d78a.tar.bz2 | |
bpo-37289: Remove 'if False' handling in the peephole optimizer (GH-14099) (GH-14112)
(cherry picked from commit 7a68f8c28bb78d957555a5001dac4df6345434a0)
Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/peephole.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Python/peephole.c b/Python/peephole.c index d7b1dfc..3e56e78 100644 --- a/Python/peephole.c +++ b/Python/peephole.c @@ -311,18 +311,12 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, } PyObject* cnt = PyList_GET_ITEM(consts, get_arg(codestr, i)); int is_true = PyObject_IsTrue(cnt); + if (is_true == -1) { + goto exitError; + } if (is_true == 1) { fill_nops(codestr, op_start, nexti + 1); cumlc = 0; - } else if (is_true == 0) { - if (i > 1 && - (_Py_OPCODE(codestr[i - 1]) == POP_JUMP_IF_TRUE || - _Py_OPCODE(codestr[i - 1]) == POP_JUMP_IF_FALSE)) { - break; - } - h = get_arg(codestr, nexti) / sizeof(_Py_CODEUNIT); - tgt = find_op(codestr, codelen, h); - fill_nops(codestr, op_start, tgt); } break; |