[pypy-svn] r71356 - pypy/branch/debug-vref2/pypy/jit/metainterp/test

[arigo at codespeak.net]

Author: arigo
Date: Sat Feb 20 10:15:40 2010
New Revision: 71356

Modified:
   pypy/branch/debug-vref2/pypy/jit/metainterp/test/test_optimizefindnode.py
   pypy/branch/debug-vref2/pypy/jit/metainterp/test/test_optimizeopt.py
Log:
Fix tests too.


Modified: pypy/branch/debug-vref2/pypy/jit/metainterp/test/test_optimizefindnode.py
==============================================================================
--- pypy/branch/debug-vref2/pypy/jit/metainterp/test/test_optimizefindnode.py	(original)
+++ pypy/branch/debug-vref2/pypy/jit/metainterp/test/test_optimizefindnode.py	Sat Feb 20 10:15:40 2010
@@ -126,6 +126,7 @@
     virtualtokendescr = vrefinfo.descr_virtual_token
     virtualrefindexdescr = vrefinfo.descr_virtualref_index
     virtualforceddescr = vrefinfo.descr_forced
+    virtualdebugfrom = vrefinfo.descr_debug_from
     jit_virtual_ref_vtable = vrefinfo.jit_virtual_ref_vtable
     jvr_vtable_adr = llmemory.cast_ptr_to_adr(jit_virtual_ref_vtable)
 

Modified: pypy/branch/debug-vref2/pypy/jit/metainterp/test/test_optimizeopt.py
==============================================================================
--- pypy/branch/debug-vref2/pypy/jit/metainterp/test/test_optimizeopt.py	(original)
+++ pypy/branch/debug-vref2/pypy/jit/metainterp/test/test_optimizeopt.py	Sat Feb 20 10:15:40 2010
@@ -2509,6 +2509,7 @@
         expected = """
         [p1]
         i0 = force_token()
+        assert(p1)
         jump(p1)
         """
         self.optimize_loop(ops, 'Not', expected)
@@ -2528,8 +2529,10 @@
         setfield_gc(p2, i0, descr=virtualtokendescr)
         setfield_gc(p2, 5, descr=virtualrefindexdescr)
         escape(p2)
+        assert(p1)
         setfield_gc(p2, p1, descr=virtualforceddescr)
-        setfield_gc(p2, 0, descr=virtualtokendescr)
+        setfield_gc(p2, -2, descr=virtualtokendescr)
+        setfield_gc(p2, 120, descr=virtualdebugfrom)
         jump(p1)
         """
         # XXX we should optimize a bit more the case of a nonvirtual.
@@ -2570,8 +2573,10 @@
         p1b = new_with_vtable(ConstClass(node_vtable))
         setfield_gc(p1b, 252, descr=valuedescr)
         setfield_gc(p1, p1b, descr=nextdescr)
+        #assert(p1) -- virtual up to right here
         setfield_gc(p2, p1, descr=virtualforceddescr)
-        setfield_gc(p2, 0, descr=virtualtokendescr)
+        setfield_gc(p2, -2, descr=virtualtokendescr)
+        setfield_gc(p2, 120, descr=virtualdebugfrom)
         #
         jump(p0, i1)
         """
@@ -2612,8 +2617,10 @@
         p1b = new_with_vtable(ConstClass(node_vtable))
         setfield_gc(p1b, i1, descr=valuedescr)
         setfield_gc(p1, p1b, descr=nextdescr)
+        #assert(p1) -- virtual up to right here
         setfield_gc(p2, p1, descr=virtualforceddescr)
-        setfield_gc(p2, 0, descr=virtualtokendescr)
+        setfield_gc(p2, -2, descr=virtualtokendescr)
+        setfield_gc(p2, 120, descr=virtualdebugfrom)
         #
         jump(p0, i1)
         """