diff options
| author | Raymond Hettinger <python@rcn.com> | 2011-03-15 14:50:16 -0700 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2011-03-15 14:50:16 -0700 |
| commit | 29dcaad6eb47d27fc2d450ae6d81cdf1d740be38 (patch) | |
| tree | 2ec6c0e148255b045c302b554ac96fe57d1587e1 | |
| parent | 729c5e203da8adc06acddaa3e7ea472d9c255774 (diff) | |
| download | cpython-git-29dcaad6eb47d27fc2d450ae6d81cdf1d740be38.tar.gz | |
Issue 11510: Fix BUILD_SET optimizer bug.
| -rw-r--r-- | Lib/test/test_peepholer.py | 14 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Python/peephole.c | 3 |
3 files changed, 17 insertions, 2 deletions
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py index 531b425077..b7d446fdd0 100644 --- a/Lib/test/test_peepholer.py +++ b/Lib/test/test_peepholer.py @@ -267,11 +267,23 @@ class TestTranforms(unittest.TestCase): asm = disassemble(f) self.assertNotIn('BINARY_ADD', asm) +class TestBuglets(unittest.TestCase): + + def test_bug_11510(self): + # folded constant set optimization was commingled with the tuple + # unpacking optimization which would fail if the set had duplicate + # elements so that the set length was unexpected + def f(): + x, y = {1, 1} + return x, y + with self.assertRaises(ValueError): + f() + def test_main(verbose=None): import sys from test import support - test_classes = (TestTranforms,) + test_classes = (TestTranforms, TestBuglets) support.run_unittest(*test_classes) # verify reference counting @@ -10,6 +10,8 @@ What's New in Python 3.2.1? Core and Builtins ----------------- +- Issue #11510: Fixed optimizer bug which turned "a,b={1,1}" into "a,b=(1,1)". + - Issue #11432: A bug was introduced in subprocess.Popen on posix systems with 3.2.0 where the stdout or stderr file descriptor being the same as the stdin file descriptor would raise an exception. webbrowser.open would fail. fixed. diff --git a/Python/peephole.c b/Python/peephole.c index f972e1611e..6985043917 100644 --- a/Python/peephole.c +++ b/Python/peephole.c @@ -475,7 +475,8 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names, } if (codestr[i+3] != UNPACK_SEQUENCE || !ISBASICBLOCK(blocks,i,6) || - j != GETARG(codestr, i+3)) + j != GETARG(codestr, i+3) || + opcode == BUILD_SET) continue; if (j == 1) { memset(codestr+i, NOP, 6); |