From cc328c3cc274b5a311285675c645287eb80b6086 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Sat, 15 Jun 2019 11:32:55 +0100 Subject: [PATCH 1/2] Remove 'if False' handling in the peephole optimizer --- Python/peephole.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Python/peephole.c b/Python/peephole.c index d7b1dfc4d9c1419..3c6006066f09f9a 100644 --- a/Python/peephole.c +++ b/Python/peephole.c @@ -314,15 +314,6 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, 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; From 455cbc70067e8d91c31022ec3ff2b0be1e9974c8 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Sat, 15 Jun 2019 14:36:51 +0100 Subject: [PATCH 2/2] fixup! Remove 'if False' handling in the peephole optimizer --- Python/peephole.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Python/peephole.c b/Python/peephole.c index 3c6006066f09f9a..3e56e788b0079b5 100644 --- a/Python/peephole.c +++ b/Python/peephole.c @@ -311,6 +311,9 @@ 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;