From 81fecf7b7a6e766a213c6e670219c1da52461589 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sat, 15 Jun 2019 08:22:34 -0700 Subject: bpo-37289: Remove 'if False' handling in the peephole optimizer (GH-14099) (GH-14111) (cherry picked from commit 7a68f8c28bb78d957555a5001dac4df6345434a0) Co-authored-by: Pablo Galindo --- Python/peephole.c | 12 +++--------- 1 file 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; -- cgit v1.2.1