[pypy-commit] pypy py3.6: fix some tests

[rlamy]

Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3.6
Changeset: r97686:0a4f164d71ba
Date: 2019-09-30 16:44 +0100
http://bitbucket.org/pypy/pypy/changeset/0a4f164d71ba/

Log:    fix some tests

diff --git a/pypy/module/pypyjit/test_pypy_c/test_string.py 
b/pypy/module/pypyjit/test_pypy_c/test_string.py
--- a/pypy/module/pypyjit/test_pypy_c/test_string.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_string.py
@@ -80,12 +80,10 @@
             guard_not_invalidated(descr=...)
             i99 = int_ge(i94, i46)
             guard_false(i99, descr=...)
-            i120 = strgetitem(p45, i94)
-            i113 = int_le(i120, 127)
-            guard_true(i113, descr=...)
             i115 = int_add(i94, 1)
             i116 = int_gt(i115, i71)
             guard_false(i116, descr=...)
+            i120 = strgetitem(p45, i94)
             i122 = 
call_i(ConstClass(_ll_2_str_eq_checknull_char__rpy_stringPtr_Char), p116, i120, 
descr=<Calli . ri EF=0 OS=30>)
             guard_true(i122, descr=...)
             i124 = int_add(i83, 1)
@@ -123,11 +121,9 @@
             i87 = int_mul(i85, 10)
             i19 = int_sub(i6, i87)
 
-            i23 = strgetitem(ConstPtr(ptr92), i19)
-            i83 = int_le(i23, 127)
-            guard_true(i83, descr=...)
             i85 = int_add(i19, 1)   # not used
             p25 = newstr(1)
+            i23 = strgetitem(ConstPtr(ptr92), i19)
             strsetitem(p25, 0, i23)
             i107 = call_i(ConstClass(string_to_int), p25, 16, 1, 1, 
descr=<Calli . riii EF=4>)
             guard_no_exception(descr=...)
@@ -280,9 +276,8 @@
         # XXX remove the guard_nonnull above?
 
     def test_unicode_indexing_makes_no_bridges(self):
-        log = self.run("""
-        b = 
b"b'aaaaa\xc3\xa4\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6'"
-        u = b.decode("utf-8") * 1000
+        log = self.run(r"""
+        u = 'ab&#228;&#128104;&#8205;&#128105;&#8205;&#128103;&#8205;&#128102; 
' * 1000
         def main():
             for j in range(10):
                 for i in range(len(u)):
@@ -329,8 +324,7 @@
     def test_unicode_slicing_small_constant_indices(self):
         log = self.run("""
         def main(n):
-            b = 
b'ab\xc3\xa4\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6'
-            u = b.decode("utf-8") * 1000
+            u = 
'ab&#228;&#128104;&#8205;&#128105;&#8205;&#128103;&#8205;&#128102; ' * 1000
             global s
             count = 0
             while u:
@@ -340,12 +334,12 @@
         """, [1000])
         loop, = log.loops_by_filename(self.filepath)
         assert loop.match_by_id('index', '''
-            i51 = int_eq(1, i38)
+            i51 = int_ge(1, i38)
             guard_false(i51, descr=...)
+            i59 = int_sub(i38, 1)
             i52 = strlen(p47)
             i53 = int_eq(i38, i52)
             guard_false(i53, descr=...)
             i56 = call_i(ConstClass(next_codepoint_pos_dont_look_inside), p47, 
0, descr=...)
             i57 = int_sub(i52, i56)
-            i59 = int_sub(i38, 1)
         ''')
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit