[Python-checkins] cpython (2.7): Issue #5057: fix a bug in the peepholer that led to non-portable pyc files
ezio.melotti
python-checkins at python.org
Fri Apr 15 15:53:01 CEST 2011
http://hg.python.org/cpython/rev/3cffa2009a92
changeset: 69369:3cffa2009a92
branch: 2.7
parent: 69365:7a693e283c68
user: Ezio Melotti
date: Fri Apr 15 16:14:04 2011 +0300
summary:
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. u"\U00012345"[0]).
files:
Lib/test/test_peepholer.py | 18 ++++++++++++++++++
Misc/NEWS | 4 ++++
Python/peephole.c | 18 ++++++++++++++++++
3 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
--- a/Lib/test/test_peepholer.py
+++ b/Lib/test/test_peepholer.py
@@ -137,6 +137,24 @@
asm = dis_single('a="x"*1000')
self.assertIn('(1000)', asm)
+ def test_binary_subscr_on_unicode(self):
+ # valid code get optimized
+ asm = dis_single('u"foo"[0]')
+ self.assertIn("(u'f')", asm)
+ self.assertNotIn('BINARY_SUBSCR', asm)
+ asm = dis_single('u"\u0061\uffff"[1]')
+ self.assertIn("(u'\\uffff')", asm)
+ self.assertNotIn('BINARY_SUBSCR', asm)
+
+ # invalid code doesn't get optimized
+ # out of range
+ asm = dis_single('u"fuu"[10]')
+ self.assertIn('BINARY_SUBSCR', asm)
+ # non-BMP char (see #5057)
+ asm = dis_single('u"\U00012345"[0]')
+ self.assertIn('BINARY_SUBSCR', asm)
+
+
def test_folding_of_unaryops_on_constants(self):
for line, elem in (
('`1`', "('1')"), # unary convert
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,10 @@
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. u"\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.
diff --git a/Python/peephole.c b/Python/peephole.c
--- a/Python/peephole.c
+++ b/Python/peephole.c
@@ -129,6 +129,24 @@
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 u'\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);
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list