[pypy-commit] pypy default: Reorganize where the dont_look_inside is to push it to a lower level. Doesn't affect anything yet because the JIT never looks in here.

[alex_gaynor]

Author: Alex Gaynor <alex.gay...@gmail.com>
Branch: 
Changeset: r60124:3ebd8e0fd171
Date: 2013-01-16 22:43 -0800
http://bitbucket.org/pypy/pypy/changeset/3ebd8e0fd171/

Log:    Reorganize where the dont_look_inside is to push it to a lower
        level. Doesn't affect anything yet because the JIT never looks in
        here.

diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py
--- a/pypy/jit/metainterp/compile.py
+++ b/pypy/jit/metainterp/compile.py
@@ -5,7 +5,7 @@
 from pypy.rlib.objectmodel import we_are_translated
 from pypy.rlib.debug import debug_start, debug_stop, debug_print
 from pypy.rlib import rstack
-from pypy.rlib.jit import JitDebugInfo, Counters
+from pypy.rlib.jit import JitDebugInfo, Counters, dont_look_inside
 from pypy.conftest import option
 from pypy.tool.sourcetools import func_with_new_name
 
@@ -685,6 +685,7 @@
         assert 0, "unreachable"
 
     @staticmethod
+    @dont_look_inside
     def force_now(cpu, token):
         # Called during a residual call from the assembler, if the code
         # actually needs to force one of the virtualrefs or the virtualizable.
diff --git a/pypy/jit/metainterp/virtualref.py 
b/pypy/jit/metainterp/virtualref.py
--- a/pypy/jit/metainterp/virtualref.py
+++ b/pypy/jit/metainterp/virtualref.py
@@ -169,4 +169,3 @@
             # token == TOKEN_NONE and the vref was not forced: it's invalid
             raise InvalidVirtualRef
         return vref.forced
-    force_virtual._dont_inline_ = True
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit