[pypy-svn] r71363 - pypy/branch/debug-vref2/pypy/jit/metainterp

[arigo at codespeak.net]

Author: arigo
Date: Sat Feb 20 19:28:15 2010
New Revision: 71363

Modified:
   pypy/branch/debug-vref2/pypy/jit/metainterp/optimizeopt.py
   pypy/branch/debug-vref2/pypy/jit/metainterp/virtualref.py
Log:
Change the usage of debug_setforced.


Modified: pypy/branch/debug-vref2/pypy/jit/metainterp/optimizeopt.py
==============================================================================
--- pypy/branch/debug-vref2/pypy/jit/metainterp/optimizeopt.py	(original)
+++ pypy/branch/debug-vref2/pypy/jit/metainterp/optimizeopt.py	Sat Feb 20 19:28:15 2010
@@ -803,6 +803,9 @@
         op1 = ResOperation(rop.SETFIELD_GC, op.args, None,
                           descr = vrefinfo.descr_forced)
         self.optimize_SETFIELD_GC(op1)
+        op1 = ResOperation(rop.SETFIELD_GC, op.args, None,
+                          descr = vrefinfo.descr_debug_setforced)
+        self.optimize_SETFIELD_GC(op1)
         # - set 'virtual_token' to TOKEN_NONE
         args = [op.args[0], ConstInt(vrefinfo.TOKEN_NONE)]
         op1 = ResOperation(rop.SETFIELD_GC, args, None,

Modified: pypy/branch/debug-vref2/pypy/jit/metainterp/virtualref.py
==============================================================================
--- pypy/branch/debug-vref2/pypy/jit/metainterp/virtualref.py	(original)
+++ pypy/branch/debug-vref2/pypy/jit/metainterp/virtualref.py	Sat Feb 20 19:28:15 2010
@@ -107,7 +107,6 @@
             assert vref.virtual_token == self.TOKEN_TRACING_RESCALL
             vref.virtual_token = self.TOKEN_NONE
             vref.debug_from = 102
-            vref.debug_setforced = vref.forced
             return False
         else:
             # marker "modified during residual call" set.
@@ -123,7 +122,6 @@
         vref.virtual_token = self.TOKEN_NONE
         vref.forced = lltype.cast_opaque_ptr(rclass.OBJECTPTR, real_object)
         vref.debug_from = 103
-        vref.debug_setforced = vref.forced
 
     def continue_tracing(self, gcref, real_object):
         if not self.is_virtual_ref(gcref):
@@ -134,7 +132,6 @@
         vref.virtual_token = self.TOKEN_NONE
         vref.forced = lltype.cast_opaque_ptr(rclass.OBJECTPTR, real_object)
         vref.debug_from = 104
-        vref.debug_setforced = vref.forced
 
     # ____________________________________________________________
 
@@ -173,6 +170,5 @@
         else:
             assert vref.forced
             vref.debug_from = 112
-        vref.debug_setforced = vref.forced
         return vref.forced
     force_virtual._dont_inline_ = True