summaryrefslogtreecommitdiffstats
path: root/Python/peephole.c
diff options
context:
space:
mode:
Diffstat (limited to 'Python/peephole.c')
-rw-r--r--Python/peephole.c193
1 files changed, 0 insertions, 193 deletions
diff --git a/Python/peephole.c b/Python/peephole.c
index 1bee710..3c5290f 100644
--- a/Python/peephole.c
+++ b/Python/peephole.c
@@ -218,153 +218,6 @@ fold_tuple_on_constants(_Py_CODEUNIT *codestr, Py_ssize_t c_start,
return copy_op_arg(codestr, c_start, LOAD_CONST, len_consts, opcode_end);
}
-/* Replace LOAD_CONST c1, LOAD_CONST c2, BINOP
- with LOAD_CONST binop(c1,c2)
- The consts table must still be in list form so that the
- new constant can be appended.
- Called with codestr pointing to the BINOP.
- Abandons the transformation if the folding fails (i.e. 1+'a').
- If the new constant is a sequence, only folds when the size
- is below a threshold value. That keeps pyc files from
- becoming large in the presence of code like: (None,)*1000.
-*/
-static Py_ssize_t
-fold_binops_on_constants(_Py_CODEUNIT *codestr, Py_ssize_t c_start,
- Py_ssize_t opcode_end, unsigned char opcode,
- PyObject *consts, PyObject **objs)
-{
- PyObject *newconst, *v, *w;
- Py_ssize_t len_consts, size;
-
- /* Pre-conditions */
- assert(PyList_CheckExact(consts));
- len_consts = PyList_GET_SIZE(consts);
-
- /* Create new constant */
- v = objs[0];
- w = objs[1];
- switch (opcode) {
- case BINARY_POWER:
- newconst = PyNumber_Power(v, w, Py_None);
- break;
- case BINARY_MULTIPLY:
- newconst = PyNumber_Multiply(v, w);
- break;
- case BINARY_TRUE_DIVIDE:
- newconst = PyNumber_TrueDivide(v, w);
- break;
- case BINARY_FLOOR_DIVIDE:
- newconst = PyNumber_FloorDivide(v, w);
- break;
- case BINARY_MODULO:
- newconst = PyNumber_Remainder(v, w);
- break;
- case BINARY_ADD:
- newconst = PyNumber_Add(v, w);
- break;
- case BINARY_SUBTRACT:
- newconst = PyNumber_Subtract(v, w);
- break;
- case BINARY_SUBSCR:
- newconst = PyObject_GetItem(v, w);
- break;
- case BINARY_LSHIFT:
- newconst = PyNumber_Lshift(v, w);
- break;
- case BINARY_RSHIFT:
- newconst = PyNumber_Rshift(v, w);
- break;
- case BINARY_AND:
- newconst = PyNumber_And(v, w);
- break;
- case BINARY_XOR:
- newconst = PyNumber_Xor(v, w);
- break;
- case BINARY_OR:
- newconst = PyNumber_Or(v, w);
- break;
- default:
- /* Called with an unknown opcode */
- PyErr_Format(PyExc_SystemError,
- "unexpected binary operation %d on a constant",
- opcode);
- return -1;
- }
- if (newconst == NULL) {
- if(!PyErr_ExceptionMatches(PyExc_KeyboardInterrupt)) {
- PyErr_Clear();
- }
- return -1;
- }
- size = PyObject_Size(newconst);
- if (size == -1) {
- if (PyErr_ExceptionMatches(PyExc_KeyboardInterrupt)) {
- return -1;
- }
- PyErr_Clear();
- } else if (size > 20) {
- Py_DECREF(newconst);
- return -1;
- }
-
- /* Append folded constant into consts table */
- if (PyList_Append(consts, newconst)) {
- Py_DECREF(newconst);
- return -1;
- }
- Py_DECREF(newconst);
-
- return copy_op_arg(codestr, c_start, LOAD_CONST, len_consts, opcode_end);
-}
-
-static Py_ssize_t
-fold_unaryops_on_constants(_Py_CODEUNIT *codestr, Py_ssize_t c_start,
- Py_ssize_t opcode_end, unsigned char opcode,
- PyObject *consts, PyObject *v)
-{
- PyObject *newconst;
- Py_ssize_t len_consts;
-
- /* Pre-conditions */
- assert(PyList_CheckExact(consts));
- len_consts = PyList_GET_SIZE(consts);
-
- /* Create new constant */
- switch (opcode) {
- case UNARY_NEGATIVE:
- newconst = PyNumber_Negative(v);
- break;
- case UNARY_INVERT:
- newconst = PyNumber_Invert(v);
- break;
- case UNARY_POSITIVE:
- newconst = PyNumber_Positive(v);
- break;
- default:
- /* Called with an unknown opcode */
- PyErr_Format(PyExc_SystemError,
- "unexpected unary operation %d on a constant",
- opcode);
- return -1;
- }
- if (newconst == NULL) {
- if(!PyErr_ExceptionMatches(PyExc_KeyboardInterrupt)) {
- PyErr_Clear();
- }
- return -1;
- }
-
- /* Append folded constant into consts table */
- if (PyList_Append(consts, newconst)) {
- Py_DECREF(newconst);
- PyErr_Clear();
- return -1;
- }
- Py_DECREF(newconst);
-
- return copy_op_arg(codestr, c_start, LOAD_CONST, len_consts, opcode_end);
-}
-
static unsigned int *
markblocks(_Py_CODEUNIT *code, Py_ssize_t len)
{
@@ -566,52 +419,6 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
}
break;
- /* Fold binary ops on constants.
- LOAD_CONST c1 LOAD_CONST c2 BINOP --> LOAD_CONST binop(c1,c2) */
- case BINARY_POWER:
- case BINARY_MULTIPLY:
- case BINARY_TRUE_DIVIDE:
- case BINARY_FLOOR_DIVIDE:
- case BINARY_MODULO:
- case BINARY_ADD:
- case BINARY_SUBTRACT:
- case BINARY_SUBSCR:
- case BINARY_LSHIFT:
- case BINARY_RSHIFT:
- case BINARY_AND:
- case BINARY_XOR:
- case BINARY_OR:
- if (CONST_STACK_LEN() < 2)
- break;
- h = lastn_const_start(codestr, op_start, 2);
- if (ISBASICBLOCK(blocks, h, op_start)) {
- h = fold_binops_on_constants(codestr, h, i + 1, opcode,
- consts, CONST_STACK_LASTN(2));
- if (h >= 0) {
- CONST_STACK_POP(2);
- CONST_STACK_PUSH_OP(h);
- }
- }
- break;
-
- /* Fold unary ops on constants.
- LOAD_CONST c1 UNARY_OP --> LOAD_CONST unary_op(c) */
- case UNARY_NEGATIVE:
- case UNARY_INVERT:
- case UNARY_POSITIVE:
- if (CONST_STACK_LEN() < 1)
- break;
- h = lastn_const_start(codestr, op_start, 1);
- if (ISBASICBLOCK(blocks, h, op_start)) {
- h = fold_unaryops_on_constants(codestr, h, i + 1, opcode,
- consts, *CONST_STACK_LASTN(1));
- if (h >= 0) {
- CONST_STACK_POP(1);
- CONST_STACK_PUSH_OP(h);
- }
- }
- break;
-
/* Simplify conditional jump to conditional jump where the
result of the first test implies the success of a similar
test or the failure of the opposite test.