[pypy-commit] pypy unicode-utf8: update improved traces in tests

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: unicode-utf8
Changeset: r95922:624ea5b754de
Date: 2019-02-09 17:32 +0100
http://bitbucket.org/pypy/pypy/changeset/624ea5b754de/

Log:	update improved traces in 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
@@ -23,22 +23,29 @@
             guard_true(i14, descr=...)
             guard_not_invalidated(descr=...)
             i16 = int_eq(i6, %d)
-            i19 = call_i(ConstClass(ll_int_py_mod__Signed_Signed), i6, i10, descr=<Calli . ii EF=0 OS=14>)
-            i21 = int_lt(i19, 0)
+            i83 = call_i(ConstClass(ll_int_py_mod__Signed_Signed), i6, i10, descr=<Calli . ii EF=0 OS=14>)
+            i21 = int_lt(i83, 0)
             guard_false(i21, descr=...)
-            i22 = int_ge(i19, i10)
+            i22 = int_ge(i83, i10)
             guard_false(i22, descr=...)
-            i23 = strgetitem(p11, i19)
-            i24 = int_ge(i19, i12)
+            i89 = strgetitem(p55, i83)
+            i24 = int_ge(i83, i12)
             guard_false(i24, descr=...)
-            i25 = unicodegetitem(p13, i19)
-            p27 = newstr(1)
-            strsetitem(p27, 0, i23)
-            p30 = call_r(ConstClass(ll_str2unicode__rpy_stringPtr), p27, descr=...)
+            i87 = strgetitem(p13, i83)
+            i91 = int_le(i87, 127)
+            guard_true(i91, descr=...)
+            i93 = int_add(i83, 1)
+            i94 = int_gt(i93, i56)
+            guard_false(i94, descr=...)
+            p96 = newstr(1)
+            strsetitem(p96, 0, i89)
+            i98 = call_i(ConstClass(first_non_ascii_char), p96, descr=<Calli 8 r EF=4>)
             guard_no_exception(descr=...)
-            i32 = call_i(ConstClass(_ll_2_str_eq_checknull_char__rpy_unicodePtr_UniChar), p30, i25, descr=...)
-            guard_true(i32, descr=...)
-            i34 = int_add(i6, 1)
+            i100 = int_lt(i98, 0)
+            guard_true(i100, descr=...)
+            i102 = call_i(ConstClass(_ll_4_str_eq_slice_char__rpy_stringPtr_Signed_Signed_Char), p55, i83, 1, i87, descr=<Calli 8 riii EF=0 OS=27>)
+            guard_true(i102, descr=...)
+            i104 = int_add(i74, 1)
             --TICK--
             jump(..., descr=...)
         """ % (-sys.maxint-1,))
@@ -209,9 +216,11 @@
         guard_not_invalidated(descr=...)
         p80 = call_r(ConstClass(ll_str__IntegerR_SignedConst_Signed), i47, descr=<Callr . i EF=3>)
         guard_no_exception(descr=...)
-        p53 = call_r(ConstClass(fast_str_decode_ascii), p80, descr=<Callr . r EF=4>)
+        i51 = call_i(ConstClass(first_non_ascii_char), p80, descr=<Calli 8 r EF=4>)
         guard_no_exception(descr=...)
+        i52 = int_lt(i51, 0)
+        guard_true(i52, descr=...)
+        i53 = strlen(p80)
         --TICK--
         jump(..., descr=...)
         """)
-        # XXX remove the guard_nonnull above?