diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-06-15 08:22:34 -0700 |
|---|---|---|
| committer | Pablo Galindo <Pablogsal@gmail.com> | 2019-06-15 16:22:34 +0100 |
| commit | 81fecf7b7a6e766a213c6e670219c1da52461589 (patch) | |
| tree | a7c829d7dc1475c98b9fd2247f3f8a9fa313dfa2 | |
| parent | d799fd34689f61560891339677200c225176796e (diff) | |
| download | cpython-git-81fecf7b7a6e766a213c6e670219c1da52461589.tar.gz | |
bpo-37289: Remove 'if False' handling in the peephole optimizer (GH-14099) (GH-14111)
(cherry picked from commit 7a68f8c28bb78d957555a5001dac4df6345434a0)
Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
| -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 f1b71ed1a7..277a216ae0 100644 --- a/Python/peephole.c +++ b/Python/peephole.c @@ -309,18 +309,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; |