From 5292179afc6fd0dc533add054d4790773c9766d0 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Fri, 14 Jun 2019 07:18:51 +0100 Subject: [3.7] bpo-37269: Correctly optimise conditionals with constant booleans (GH-14071) (GH-14073) Fix a regression introduced by af8646c8054d0f4180a2013383039b6a472f9698 that was causing code of the form: if True and False: do_something() to be optimized incorrectly, eliminating the block.. (cherry picked from commit 05f831865545b08c9a21cfb7773af58b76ec64cb) Co-authored-by: Pablo Galindo --- Python/peephole.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Python') diff --git a/Python/peephole.c b/Python/peephole.c index 1ae62fa39a..f1b71ed1a7 100644 --- a/Python/peephole.c +++ b/Python/peephole.c @@ -313,6 +313,11 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, 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); -- cgit v1.2.1