Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3.5
Changeset: r93450:413ffdce2e44
Date: 2017-12-17 15:03 +0000
http://bitbucket.org/pypy/pypy/changeset/413ffdce2e44/
Log: fix 2 tests
diff --git a/pypy/module/pypyjit/test_pypy_c/test_containers.py
b/pypy/module/pypyjit/test_pypy_c/test_containers.py
--- a/pypy/module/pypyjit/test_pypy_c/test_containers.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_containers.py
@@ -66,10 +66,12 @@
guard_not_invalidated(descr=...)
p109 = call_r(ConstClass(ll_str__IntegerR_SignedConst_Signed), i5,
descr=<Callr . i EF=3>)
guard_no_exception(descr=...)
- guard_nonnull(p109, descr=...)
- p10 = call_r(ConstClass(ll_str2unicode__rpy_stringPtr), p109,
descr=<Callr . r EF=4 OS=2>)
+ i80 = strlen(p109)
+ p86 = call_r(ConstClass(str_decode_utf_8), p109, i80,
ConstPtr(ptr82), 1, ConstClass(raise_unicode_exception_decode), 1, descr=<Callr
8 ririii EF=4>)
guard_no_exception(descr=...)
+ p10 = getfield_gc_r(p86, descr=<FieldP tuple2.item0 8 pure>)
guard_nonnull(p10, descr=...)
+
i99 = unicodehash(p10)
# NOTE: with siphash24, notably on unicodes, computing the hash
# may raise MemoryError
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
@@ -116,10 +116,7 @@
p97 = call_r(ConstClass(_rpy_unicode_to_decimal_w), p25,
descr=<Callr . r EF=5>)
guard_no_exception(descr=...)
i98 = unicodelen(p97)
- p99 = force_token()
- setfield_gc(p0, p99, descr=<FieldP
pypy.interpreter.pyframe.PyFrame.vable_token .>)
- p104 = call_may_force_r(ConstClass(unicode_encode_utf_8_impl),
p97, i98, ConstPtr(ptr101), 1, 1, descr=<Callr . ririi EF=7>)
- guard_not_forced(descr=...)
+ p104 = call_r(ConstClass(unicode_encode_utf_8), p97, i98,
ConstPtr(ptr94), 1, descr=<Callr 8 riri EF=4>)
guard_no_exception(descr=...)
i107 = call_i(ConstClass(string_to_int), p104, 16, descr=<Calli .
ri EF=4>)
guard_no_exception(descr=...)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
