From: Pablo Galindo <Pablogsal@gmail.com>
Date: Sat, 15 Jun 2019 14:58:00 +0000 (+0100)
Subject: bpo-37289: Remove 'if False' handling in the peephole optimizer (GH-14099)
X-Git-Tag: v3.9.0a1~1271
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a68f8c28bb78d957555a5001dac4df6345434a0;p=thirdparty%2FPython%2Fcpython.git

bpo-37289: Remove 'if False' handling in the peephole optimizer (GH-14099)
---

diff --git a/Python/peephole.c b/Python/peephole.c
index d7b1dfc4d9c1..3e56e788b007 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;