[pypy-svn] r79022 - pypy/branch/mapdict-without-jit/pypy/objspace/std

[cfbolz at codespeak.net]

Author: cfbolz
Date: Fri Nov 12 00:20:13 2010
New Revision: 79022

Modified:
   pypy/branch/mapdict-without-jit/pypy/objspace/std/callmethod.py
Log:
the JIT should not see this stuff


Modified: pypy/branch/mapdict-without-jit/pypy/objspace/std/callmethod.py
==============================================================================
--- pypy/branch/mapdict-without-jit/pypy/objspace/std/callmethod.py	(original)
+++ pypy/branch/mapdict-without-jit/pypy/objspace/std/callmethod.py	Fri Nov 12 00:20:13 2010
@@ -34,7 +34,7 @@
     space = f.space
     w_obj = f.popvalue()
 
-    if space.config.objspace.std.withmapdict:
+    if space.config.objspace.std.withmapdict and not jit.we_are_jitted():
         # mapdict has an extra-fast version of this function
         from pypy.objspace.std.mapdict import LOOKUP_METHOD_mapdict
         if LOOKUP_METHOD_mapdict(f, nameindex, w_obj):
@@ -60,7 +60,8 @@
                     # nothing in the instance
                     f.pushvalue(w_descr)
                     f.pushvalue(w_obj)
-                    if space.config.objspace.std.withmapdict:
+                    if (space.config.objspace.std.withmapdict and
+                            not jit.we_are_jitted():
                         # let mapdict cache stuff
                         LOOKUP_METHOD_mapdict_fill_cache_method(
                             f.getcode(), nameindex, w_obj, w_type, w_descr)