[pypy-svn] r77747 - in pypy/branch/jit-unroll-loops/pypy/jit/metainterp: . optimizeopt

[hakanardo at codespeak.net]

Author: hakanardo
Date: Sat Oct  9 17:39:19 2010
New Revision: 77747

Modified:
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/unroll.py
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/resoperation.py
Log:
bugfix

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	Sat Oct  9 17:39:19 2010
@@ -41,7 +41,9 @@
 
         inputargs = []
         for arg in jump_args:
-            inputargs.extend(self.getvalue(arg).get_forced_boxes())
+            for a in self.getvalue(arg).get_forced_boxes():
+                if not isinstance(a, Const):
+                    inputargs.append(a)
         
         for op in loop_operations:
             newop = op.clone()

Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/resoperation.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/resoperation.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/resoperation.py	Sat Oct  9 17:39:19 2010
@@ -84,7 +84,7 @@
         descr = self.getdescr()
         if descr is not None:
             descr = descr.clone_if_mutable()
-        op = ResOperation(self.getopnum(), args, self.result, descr)
+        op = ResOperation(self.getopnum(), args[:], self.result, descr)
         if not we_are_translated():
             op.name = self.name
             op.pc = self.pc