[pypy-svn] r70505 - pypy/branch/loop-invariant-decorator/pypy/interpreter

[cfbolz at codespeak.net]

Author: cfbolz
Date: Mon Jan 11 15:27:39 2010
New Revision: 70505

Modified:
   pypy/branch/loop-invariant-decorator/pypy/interpreter/baseobjspace.py
Log:
missing import, of course


Modified: pypy/branch/loop-invariant-decorator/pypy/interpreter/baseobjspace.py
==============================================================================
--- pypy/branch/loop-invariant-decorator/pypy/interpreter/baseobjspace.py	(original)
+++ pypy/branch/loop-invariant-decorator/pypy/interpreter/baseobjspace.py	Mon Jan 11 15:27:39 2010
@@ -9,7 +9,7 @@
 from pypy.rlib.objectmodel import we_are_translated
 from pypy.rlib.debug import make_sure_not_resized
 from pypy.rlib.timer import DummyTimer, Timer
-from pypy.rlib.jit import we_are_jitted, unroll_safe
+from pypy.rlib import jit
 import os, sys
 
 __all__ = ['ObjSpace', 'OperationError', 'Wrappable', 'W_Root']
@@ -736,7 +736,7 @@
         """
         return self.unpackiterable(w_iterable, expected_length)
 
-    @unroll_safe
+    @jit.unroll_safe
     def exception_match(self, w_exc_type, w_check_class):
         """Checks if the given exception type matches 'w_check_class'."""
         if self.is_w(w_exc_type, w_check_class):
@@ -792,7 +792,7 @@
 
     def call_valuestack(self, w_func, nargs, frame):
         from pypy.interpreter.function import Function, Method, is_builtin_code
-        if (not we_are_jitted() and frame.is_being_profiled and
+        if (not jit.we_are_jitted() and frame.is_being_profiled and
             is_builtin_code(w_func)):
             # XXX: this code is copied&pasted :-( from the slow path below
             # call_valuestack().