[pypy-svn] r74843 - pypy/branch/blackhole-improvement/pypy/jit/metainterp/test

[arigo at codespeak.net]

Author: arigo
Date: Fri May 28 13:03:34 2010
New Revision: 74843

Modified:
   pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_optimizeopt.py
   pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_resume.py
Log:
Fix tests.


Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_optimizeopt.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_optimizeopt.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_optimizeopt.py	Fri May 28 13:03:34 2010
@@ -2561,7 +2561,7 @@
         setfield_gc(p2, 5, descr=virtualrefindexdescr)
         escape(p2)
         setfield_gc(p2, p1, descr=virtualforceddescr)
-        setfield_gc(p2, -2, descr=virtualtokendescr)
+        setfield_gc(p2, -3, descr=virtualtokendescr)
         jump(p1)
         """
         # XXX we should optimize a bit more the case of a nonvirtual.
@@ -2603,7 +2603,7 @@
         setfield_gc(p1b, 252, descr=valuedescr)
         setfield_gc(p1, p1b, descr=nextdescr)
         setfield_gc(p2, p1, descr=virtualforceddescr)
-        setfield_gc(p2, -2, descr=virtualtokendescr)
+        setfield_gc(p2, -3, descr=virtualtokendescr)
         jump(p0, i1)
         """
         self.optimize_loop(ops, 'Not, Not', expected)
@@ -2644,7 +2644,7 @@
         setfield_gc(p1b, i1, descr=valuedescr)
         setfield_gc(p1, p1b, descr=nextdescr)
         setfield_gc(p2, p1, descr=virtualforceddescr)
-        setfield_gc(p2, -2, descr=virtualtokendescr)
+        setfield_gc(p2, -3, descr=virtualtokendescr)
         jump(p0, i1)
         """
         # the point of this test is that 'i1' should show up in the fail_args
@@ -2715,7 +2715,7 @@
         escape(p2)
         p1 = new_with_vtable(ConstClass(node_vtable))
         setfield_gc(p2, p1, descr=virtualforceddescr)
-        setfield_gc(p2, -2, descr=virtualtokendescr)
+        setfield_gc(p2, -3, descr=virtualtokendescr)
         call_may_force(i1, descr=mayforcevirtdescr)
         guard_not_forced() []
         jump(i1)
@@ -2741,7 +2741,7 @@
         setfield_gc(p2, 23, descr=virtualrefindexdescr)
         escape(p2)
         setfield_gc(p2, p1, descr=virtualforceddescr)
-        setfield_gc(p2, -2, descr=virtualtokendescr)
+        setfield_gc(p2, -3, descr=virtualtokendescr)
         call_may_force(i1, descr=mayforcevirtdescr)
         guard_not_forced() [i1]
         jump(i1, p1)

Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_resume.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_resume.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_resume.py	Fri May 28 13:03:34 2010
@@ -333,12 +333,7 @@
     assert frame_info_list.pc == 15
 
     snapshot = storage.rd_snapshot
-    assert snapshot.boxes == vbs
-    assert snapshot.boxes is not vbs
-
-    snapshot = snapshot.prev
-    assert snapshot.boxes == vrs
-    assert snapshot.boxes is not vrs
+    assert snapshot.boxes == vrs + vbs      # in the same list
 
     snapshot = snapshot.prev
     assert snapshot.prev is fs[2].parent_resumedata_snapshot
@@ -829,9 +824,10 @@
 class ResumeDataFakeReader(ResumeDataBoxReader):
     """Another subclass of AbstractResumeDataReader meant for tests."""
     def __init__(self, storage, newboxes, metainterp):
+        self._init(metainterp.cpu, storage)
         self.liveboxes = newboxes
         self.metainterp = metainterp
-        self._prepare(metainterp.cpu, storage)
+        self._prepare(storage)
 
     def consume_boxes(self):
         self.lst = []