[pypy-svn] r64656 - pypy/branch/pyjitpl5/pypy/jit/metainterp

[fijal at codespeak.net]

Author: fijal
Date: Fri Apr 24 21:18:45 2009
New Revision: 64656

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py
Log:
make simple optimize the default


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py	Fri Apr 24 21:18:45 2009
@@ -817,11 +817,7 @@
             self.optimize_loop = optimizer.optimize_loop
             self.optimize_bridge = optimizer.optimize_bridge
         else:
-            # hack hack hack
-            if self.cpu.is_oo:
-                from pypy.jit.metainterp import simple_optimize as optimize
-            else:
-                from pypy.jit.metainterp import optimize
+            from pypy.jit.metainterp import simple_optimize as optimize
             self.optimize_loop = optimize.optimize_loop
             self.optimize_bridge = optimize.optimize_bridge