diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-04-15 13:38:34 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-04-15 13:38:34 (GMT) |
| commit | 2df6a939164a8aec914086137f1242c205312f72 (patch) | |
| tree | 5d46d9c3db5278c75ddced1a6ea90cb666d2dc2f | |
| parent | 397eb4411a076825766cb2b71e78b585ff3a4d24 (diff) | |
| download | cpython-2df6a939164a8aec914086137f1242c205312f72.zip cpython-2df6a939164a8aec914086137f1242c205312f72.tar.gz cpython-2df6a939164a8aec914086137f1242c205312f72.tar.bz2 | |
Issue #5057: fix a bug in the peepholer that led to non-portable pyc files between narrow and wide builds while optimizing BINARY_SUBSCR on non-BMP chars (e.g. "\U00012345"[0]).
| -rw-r--r-- | Lib/test/test_peepholer.py | 18 | ||||
| -rw-r--r-- | Misc/NEWS | 6 | ||||
| -rw-r--r-- | Python/peephole.c | 18 |
3 files changed, 41 insertions, 1 deletions
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py index 5696500..d1d5874 100644 --- a/Lib/test/test_peepholer.py +++ b/Lib/test/test_peepholer.py @@ -146,6 +146,24 @@ class TestTranforms(unittest.TestCase): asm = dis_single('a="x"*1000') self.assertTrue('(1000)' in asm) + def test_binary_subscr_on_unicode(self): + # valid code get optimized + asm = dis_single('"foo"[0]') + self.assertIn("('f')", asm) + self.assertNotIn('BINARY_SUBSCR', asm) + asm = dis_single('"\u0061\uffff"[1]') + self.assertIn("('\\uffff')", asm) + self.assertNotIn('BINARY_SUBSCR', asm) + + # invalid code doesn't get optimized + # out of range + asm = dis_single('"fuu"[10]') + self.assertIn('BINARY_SUBSCR', asm) + # non-BMP char (see #5057) + asm = dis_single('"\U00012345"[0]') + self.assertIn('BINARY_SUBSCR', asm) + + def test_folding_of_unaryops_on_constants(self): for line, elem in ( ('-0.5', '(-0.5)'), # unary negative @@ -10,6 +10,10 @@ What's New in Python 3.1.4? Core and Builtins ----------------- +- Issue #5057: fix a bug in the peepholer that led to non-portable pyc files + between narrow and wide builds while optimizing BINARY_SUBSCR on non-BMP + chars (e.g. "\U00012345"[0]). + - Issue #11650: PyOS_StdioReadline() retries fgets() if it was interrupted (EINTR), for example if the program is stopped with CTRL+z on Mac OS X. Patch written by Charles-Francois Natali. @@ -51,7 +55,7 @@ Core and Builtins Library ------- -- Issue #11467: Fix urlparse behavior when handling urls which contains scheme +- Issue #11467: Fix urlparse behavior when handling urls which contains scheme specific part only digits. Patch by Santoso Wijaya. - Issue #11474: Fix the bug with url2pathname() handling of '/C|/' on Windows. diff --git a/Python/peephole.c b/Python/peephole.c index 06e7fe6..c27878c 100644 --- a/Python/peephole.c +++ b/Python/peephole.c @@ -124,6 +124,24 @@ fold_binops_on_constants(unsigned char *codestr, PyObject *consts) break; case BINARY_SUBSCR: newconst = PyObject_GetItem(v, w); + /* #5057: if v is unicode, there might be differences between + wide and narrow builds in cases like '\U00012345'[0]. + Wide builds will return a non-BMP char, whereas narrow builds + will return a surrogate. In both the cases skip the + optimization in order to produce compatible pycs. + */ + if (newconst != NULL && + PyUnicode_Check(v) && PyUnicode_Check(newconst)) { + Py_UNICODE ch = PyUnicode_AS_UNICODE(newconst)[0]; +#ifdef Py_UNICODE_WIDE + if (ch > 0xFFFF) { +#else + if (ch >= 0xD800 && ch <= 0xDFFF) { +#endif + Py_DECREF(newconst); + return 0; + } + } break; case BINARY_LSHIFT: newconst = PyNumber_Lshift(v, w); |