mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-13 15:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Maintain peepholer's cumlc invariant by updating the running total

Browse source 
everytime a LOAD_CONSTANT is encountered, created, or overwritten.

Added two tests to cover cases affected by the patch.
This commit is contained in:
Raymond Hettinger 2004-11-02 04:20:10 +00:00
parent 7d112df94f
commit 5dec096e6a
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_peepholer.py
View file

@ -75,9 +75,11 @@ class TestTranforms(unittest.TestCase):
def test_folding_of_tuples_of_constants(self): def test_folding_of_tuples_of_constants(self):
for line, elem in ( for line, elem in (
('a = 1,2,3', '((1, 2, 3))',), ('a = 1,2,3', '((1, 2, 3))'),
('("a","b","c")', "(('a', 'b', 'c'))",), ('("a","b","c")', "(('a', 'b', 'c'))"),
('a,b,c = 1,2,3', '((1, 2, 3))',), ('a,b,c = 1,2,3', '((1, 2, 3))'),
('(None, 1, None)', '((None, 1, None))'),
('((1, 2), 3, 4)', '(((1, 2), 3, 4))'),
): ):
asm = dis_single(line) asm = dis_single(line)
self.assert_(elem in asm) self.assert_(elem in asm)

4
Python/compile.c
View file

@ -586,6 +586,7 @@ optimize_code(PyObject *code, PyObject* consts, PyObject *names, PyObject *linen
if (PyList_GET_ITEM(consts, j) == Py_None) { if (PyList_GET_ITEM(consts, j) == Py_None) {
codestr[i] = LOAD_CONST; codestr[i] = LOAD_CONST;
SETARG(codestr, i, j); SETARG(codestr, i, j);
cumlc = lastlc + 1;
break; break;
} }
} }
@ -601,6 +602,7 @@ optimize_code(PyObject *code, PyObject* consts, PyObject *names, PyObject *linen
!PyObject_IsTrue(PyList_GET_ITEM(consts, j))) !PyObject_IsTrue(PyList_GET_ITEM(consts, j)))
continue; continue;
memset(codestr+i, NOP, 7); memset(codestr+i, NOP, 7);
cumlc = 0;
break; break;
/* Try to fold tuples of constants. /* Try to fold tuples of constants.
@ -615,6 +617,8 @@ optimize_code(PyObject *code, PyObject* consts, PyObject *names, PyObject *linen
codestr[h] == LOAD_CONST && codestr[h] == LOAD_CONST &&
ISBASICBLOCK(blocks, h, 3*(j+1)) && ISBASICBLOCK(blocks, h, 3*(j+1)) &&
tuple_of_constants(&codestr[h], j, consts)) { tuple_of_constants(&codestr[h], j, consts)) {
assert(codestr[i] == LOAD_CONST);
cumlc = 1;
break; break;
} }
/* Intentional fallthrough */ /* Intentional fallthrough */