[pypy-commit] pypy default: merge heads

gutworth noreply at buildbot.pypy.org
Wed Jun 8 01:18:25 CEST 2011


Author: Benjamin Peterson <benjamin at python.org>
Branch: 
Changeset: r44822:562adf597de4
Date: 2011-06-07 18:19 -0500
http://bitbucket.org/pypy/pypy/changeset/562adf597de4/

Log:	merge heads

diff --git a/pypy/module/pypyjit/interp_jit.py b/pypy/module/pypyjit/interp_jit.py
--- a/pypy/module/pypyjit/interp_jit.py
+++ b/pypy/module/pypyjit/interp_jit.py
@@ -16,6 +16,7 @@
 from pypy.interpreter.baseobjspace import ObjSpace, W_Root
 from opcode import opmap
 from pypy.rlib.objectmodel import we_are_translated
+from pypy.rlib.nonconst import NonConstant
 
 PyFrame._virtualizable2_ = ['last_instr', 'pycode',
                             'valuestackdepth', 'valuestack_w[*]',
@@ -199,9 +200,10 @@
     return space.call_args(w_callable, __args__)
 
 class Cache(object):
+    in_recursion = False
+    
     def __init__(self, space):
         self.w_compile_hook = space.w_None
-        self.in_recursion = False
 
 @unwrap_spec(ObjSpace, W_Root)
 def set_compile_hook(space, w_hook):
@@ -226,4 +228,5 @@
     """
     cache = space.fromcache(Cache)
     cache.w_compile_hook = w_hook
+    cache.in_recursion = NonConstant(False)
     return space.w_None


More information about the pypy-commit mailing list