Author: Armin Rigo <[email protected]>
Branch: optresult-unroll
Changeset: r79507:65b2fa912c67
Date: 2015-09-07 19:44 +0200
http://bitbucket.org/pypy/pypy/changeset/65b2fa912c67/

Log:    Fix the test. Now only versions 3 and 4 fail

diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py 
b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -3324,41 +3324,45 @@
 
     def test_arraycopy_invalidate_1(self):
         ops = """
-        [p0, i5]
-        p1 = new_array_clear(i5, descr=gcarraydescr)
+        [i5]
+        p0 = escape_r()
+        p1 = new_array_clear(i5, descr=arraydescr)
         call_n(0, p0, p1, 0, 0, i5, descr=arraycopydescr)
-        p2 = getarrayitem_gc_r(p1, 0, descr=gcarraydescr)   # != NULL
-        jump(p2)
+        i2 = getarrayitem_gc_i(p1, 0, descr=arraydescr)   # != NULL
+        jump(i2)
         """
         self.optimize_loop(ops, ops)
 
     def test_arraycopy_invalidate_2(self):
         ops = """
-        [p0, i5]
-        p1 = new_array_clear(i5, descr=gcarraydescr)
-        call_n(0, p0, p1, 0, 0, 3, descr=arraycopydescr)
-        p2 = getarrayitem_gc_r(p1, 0, descr=gcarraydescr)   # != NULL
-        jump(p2)
+        [i5]
+        p0 = escape_r()
+        p1 = new_array_clear(i5, descr=arraydescr)
+        call_n(0, p0, p1, 0, 0, 100, descr=arraycopydescr)
+        i2 = getarrayitem_gc_i(p1, 0, descr=arraydescr)   # != NULL
+        jump(i2)
         """
         self.optimize_loop(ops, ops)
 
     def test_arraycopy_invalidate_3(self):
         ops = """
-        [p0, i5]
-        p1 = new_array_clear(3, descr=gcarraydescr)
+        [i5]
+        p0 = escape_r()
+        p1 = new_array_clear(100, descr=arraydescr)
         call_n(0, p0, p1, 0, 0, i5, descr=arraycopydescr)
-        p2 = getarrayitem_gc_r(p1, 0, descr=gcarraydescr)   # != NULL
-        jump(p2)
+        i2 = getarrayitem_gc_i(p1, 0, descr=arraydescr)   # != NULL
+        jump(i2)
         """
         self.optimize_loop(ops, ops)
 
     def test_arraycopy_invalidate_4(self):
         ops = """
-        [p0, i5]
-        p1 = new_array_clear(3, descr=gcarraydescr)
-        call_n(0, p0, p1, 0, 0, 3, descr=arraycopydescr)
-        p2 = getarrayitem_gc_r(p1, 0, descr=gcarraydescr)   # != NULL
-        jump(p2)
+        [i5]
+        p0 = escape_r()
+        p1 = new_array_clear(100, descr=arraydescr)
+        call_n(0, p0, p1, 0, 0, 100, descr=arraycopydescr)
+        i2 = getarrayitem_gc_i(p1, 0, descr=arraydescr)   # != NULL
+        jump(i2)
         """
         self.optimize_loop(ops, ops)
 
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to