[pypy-svn] r69595 - pypy/trunk/pypy/jit/backend/cli

[antocuni at codespeak.net]

Author: antocuni
Date: Tue Nov 24 18:08:39 2009
New Revision: 69595

Modified:
   pypy/trunk/pypy/jit/backend/cli/method.py
   pypy/trunk/pypy/jit/backend/cli/runner.py
Log:
consider 'holes' in fail_args. This fixes the tests broken by the merging of
the compress-virtuals-resumedata branch



Modified: pypy/trunk/pypy/jit/backend/cli/method.py
==============================================================================
--- pypy/trunk/pypy/jit/backend/cli/method.py	(original)
+++ pypy/trunk/pypy/jit/backend/cli/method.py	Tue Nov 24 18:08:39 2009
@@ -459,7 +459,8 @@
         # store the latest values
         i = 0
         for box in args:
-            self.store_inputarg(i, box.type, box.getCliType(self), box)
+            if box is not None:
+                self.store_inputarg(i, box.type, box.getCliType(self), box)
             i+=1
 
     def emit_guard_bool(self, op, opcode):

Modified: pypy/trunk/pypy/jit/backend/cli/runner.py
==============================================================================
--- pypy/trunk/pypy/jit/backend/cli/runner.py	(original)
+++ pypy/trunk/pypy/jit/backend/cli/runner.py	Tue Nov 24 18:08:39 2009
@@ -45,6 +45,7 @@
 
     def __init__(self, rtyper, stats, translate_support_code=False,
                  mixlevelann=None, gcdescr=None):
+        model.AbstractCPU.__init__(self)
         self.rtyper = rtyper
         if rtyper:
             assert rtyper.type_system.name == "ootypesystem"