[Python-checkins] bpo-37289: Remove 'if False' handling in the peephole optimizer (GH-14099) (GH-14112)

[Pablo Galindo]

https://github.com/python/cpython/commit/284daeade210d3aac049f4278a1fb76d19e6d78a
commit: 284daeade210d3aac049f4278a1fb76d19e6d78a
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Pablo Galindo <Pablogsal at gmail.com>
date: 2019-06-15T16:22:08+01:00
summary:

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 at gmail.com>

files:
M Python/peephole.c

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;