[pypy-svn] r64700 - in pypy/branch/pyjitpl5/pypy/jit/metainterp: . test

[fijal at codespeak.net]

Author: fijal
Date: Sun Apr 26 18:57:58 2009
New Revision: 64700

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_basic.py
Log:
Revert


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	Sun Apr 26 18:57:58 2009
@@ -842,10 +842,10 @@
             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
+            if self.cpu.is_oo:
+                from pypy.jit.metainterp import simple_optimize as optimize
+            else:
+                from pypy.jit.metainterp import optimize
             self.optimize_loop = optimize.optimize_loop
             self.optimize_bridge = optimize.optimize_bridge
 

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_basic.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_basic.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_basic.py	Sun Apr 26 18:57:58 2009
@@ -30,10 +30,8 @@
 
 class JitMixin:
     basic = True
-    #def check_loops(self, expected=None, **check):
-    #    get_stats().check_loops(expected=expected, **check)
     def check_loops(self, expected=None, **check):
-        pass
+        get_stats().check_loops(expected=expected, **check)
     def check_loop_count(self, count):
         """NB. This is a hack; use check_tree_loop_count() or
         check_enter_count() for the real thing.