[pypy-svn] r71462 - pypy/branch/debug-vref3/pypy/jit/metainterp

[arigo at codespeak.net]

Author: arigo
Date: Wed Feb 24 18:27:28 2010
New Revision: 71462

Modified:
   pypy/branch/debug-vref3/pypy/jit/metainterp/optimizeopt.py
Log:
This is the state of optimizeopt that I would like to obtain.
Now I have to understand why no test_optimizeopt fails.


Modified: pypy/branch/debug-vref3/pypy/jit/metainterp/optimizeopt.py
==============================================================================
--- pypy/branch/debug-vref3/pypy/jit/metainterp/optimizeopt.py	(original)
+++ pypy/branch/debug-vref3/pypy/jit/metainterp/optimizeopt.py	Wed Feb 24 18:27:28 2010
@@ -794,7 +794,7 @@
         # typically a PyPy PyFrame, and now is the end of its execution, so
         # forcing it now does not have catastrophic effects.
         vrefinfo = self.metainterp_sd.virtualref_info
-        assert op.args[1].nonnull()
+        # op.args[1] should really never point to null here
         # - set 'forced' to point to the real object
         op1 = ResOperation(rop.SETFIELD_GC, op.args, None,
                           descr = vrefinfo.descr_forced)
@@ -1028,8 +1028,7 @@
                 effectinfo = None
             else:
                 effectinfo = op.descr.get_extra_info()
-            if (effectinfo is not None and
-                not effectinfo.forces_virtual_or_virtualizable):
+            if effectinfo is not None:
                 # XXX we can get the wrong complexity here, if the lists
                 # XXX stored on effectinfo are large
                 for fielddescr in effectinfo.readonly_descrs_fields: