summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Galindo <Pablogsal@gmail.com>2019-06-15 14:58:00 (GMT)
committerGitHub <noreply@github.com>2019-06-15 14:58:00 (GMT)
commit7a68f8c28bb78d957555a5001dac4df6345434a0 (patch)
tree877e3b50aeb7f901f779bcd8c806651323712d55
parentcfa0394b9760941bbdd089913a6420d2af54314a (diff)
downloadcpython-7a68f8c28bb78d957555a5001dac4df6345434a0.zip
cpython-7a68f8c28bb78d957555a5001dac4df6345434a0.tar.gz
cpython-7a68f8c28bb78d957555a5001dac4df6345434a0.tar.bz2
bpo-37289: Remove 'if False' handling in the peephole optimizer (GH-14099)
-rw-r--r--Python/peephole.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/Python/peephole.c b/Python/peephole.c
index d7b1dfc..3e56e78 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;