[pypy-svn] pypy jit-usable_retrace: resolved merge

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-usable_retrace
Changeset: r42958:e7e4bc716e07
Date: 2011-03-26 09:39 +0100
http://bitbucket.org/pypy/pypy/changeset/e7e4bc716e07/

Log:	resolved merge

diff --git a/pypy/jit/metainterp/optimizeopt/__init__.py b/pypy/jit/metainterp/optimizeopt/__init__.py
--- a/pypy/jit/metainterp/optimizeopt/__init__.py
+++ b/pypy/jit/metainterp/optimizeopt/__init__.py
@@ -26,6 +26,7 @@
 PARAMETERS['enable_opts'] = ALL_OPTS_NAMES
 
 def optimize_loop_1(metainterp_sd, loop, enable_opts,
+                    inline_short_preamble=True, retrace=None):
     """Optimize loop.operations to remove internal overheadish operations.
     """
     optimizations = []
@@ -44,7 +45,7 @@
         optimizations.append(OptSimplify())
 
     if inline_short_preamble:
-        optimizations = [OptInlineShortPreamble(retraced)] + optimizations
+        optimizations = [OptInlineShortPreamble(retrace)] + optimizations
 
     if unroll:
         optimize_unroll(metainterp_sd, loop, optimizations)
@@ -61,7 +62,7 @@
     except KeyError:
         pass
     optimize_loop_1(metainterp_sd, bridge, enable_opts,
-                    inline_short_preamble, retraced)
+                    inline_short_preamble, retrace)
 
 if __name__ == '__main__':
     print ALL_OPTS_NAMES