[pypy-svn] r77706 - in pypy/branch/jit-unroll-loops/pypy/jit/metainterp: optimizeopt test

[hakanardo at codespeak.net]

Author: hakanardo
Date: Fri Oct  8 07:36:02 2010
New Revision: 77706

Modified:
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/unroll.py
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_basic.py
Log:
Fixed fail_args

Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/unroll.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/unroll.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/unroll.py	Fri Oct  8 07:36:02 2010
@@ -70,7 +70,7 @@
                             a = argmap[a]
                         except KeyError:
                             pass
-                        args.append(a)
+                        args.append(self.getvalue(a).force_box())
                     op.setfailargs(args)
                     op.getdescr().rd_snapshot = None #FIXME: In the right place?
                     

Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_basic.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_basic.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_basic.py	Fri Oct  8 07:36:02 2010
@@ -392,9 +392,9 @@
         res = self.meta_interp(f, [6, 16])
         assert res == 828
         self.check_loop_count(3)
-        self.check_loops({'int_lt': 1, 'int_gt': 1,
-                          'guard_false': 1, 'guard_true': 1,
-                          'int_sub': 2, 'int_mul': 2, 'int_add': 2,
+        self.check_loops({'int_lt': 2, 'int_gt': 1,
+                          'guard_false': 2, 'guard_true': 1,
+                          'int_sub': 3, 'int_mul': 1, 'int_add': 3,
                           'jump': 3})
 
     def test_loop_invariant_intbox(self):