[pypy-svn] r78462 - pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt

[arigo at codespeak.net]

Author: arigo
Date: Fri Oct 29 13:44:30 2010
New Revision: 78462

Modified:
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/unroll.py
Log:
(hakanardo, arigo)  Fix.


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 29 13:44:30 2010
@@ -79,7 +79,7 @@
                 #for arg in newop.getarglist():
                 for arg in inputargs:
                     arg = argmap[arg]
-                    self.getvalue(arg).enum_forced_boxes(args, {})
+                    args.append(self.getvalue(arg).force_box())
                 newop.initarglist(args + inputargs[len(args):])
 
             #print 'P: ', str(newop)
@@ -108,8 +108,8 @@
                             jmp = self.optimizer.newoperations[-1]
                             if jmp.getopnum() == rop.JUMP:
                                 newval = self.getvalue(argmap[a])
-                                boxes = jmp.getarglist()[:]
-                                newval.enum_forced_boxes(boxes, {})
+                                boxes = jmp.getarglist()
+                                boxes.append(newval.force_box())
                                 jmp.initarglist(boxes)
 
         return inputargs