[pypy-svn] r71298 - pypy/branch/string-promote/pypy/objspace/std

[fijal at codespeak.net]

Author: fijal
Date: Thu Feb 18 17:02:30 2010
New Revision: 71298

Modified:
   pypy/branch/string-promote/pypy/objspace/std/celldict.py
   pypy/branch/string-promote/pypy/objspace/std/typeobject.py
Log:
fun. revert changes


Modified: pypy/branch/string-promote/pypy/objspace/std/celldict.py
==============================================================================
--- pypy/branch/string-promote/pypy/objspace/std/celldict.py	(original)
+++ pypy/branch/string-promote/pypy/objspace/std/celldict.py	Thu Feb 18 17:02:30 2010
@@ -31,7 +31,7 @@
             return self._getcell_makenew(key)
         return self.content.get(key, None)
 
-    @jit.purefunction
+    @jit.purefunction_promote
     def _getcell_makenew(self, key):
         res = self.content.get(key, None)
         if res is not None:

Modified: pypy/branch/string-promote/pypy/objspace/std/typeobject.py
==============================================================================
--- pypy/branch/string-promote/pypy/objspace/std/typeobject.py	(original)
+++ pypy/branch/string-promote/pypy/objspace/std/typeobject.py	Thu Feb 18 17:02:30 2010
@@ -9,7 +9,7 @@
 from pypy.rlib.objectmodel import we_are_translated
 from pypy.rlib.objectmodel import current_object_addr_as_int, compute_hash
 from pypy.rlib.jit import hint, purefunction_promote, we_are_jitted
-from pypy.rlib.jit import dont_look_inside, purefunction
+from pypy.rlib.jit import dont_look_inside
 from pypy.rlib.rarithmetic import intmask, r_uint
 
 from copy_reg import _HEAPTYPE
@@ -248,7 +248,7 @@
             return tup
         return w_self._pure_lookup_where_with_method_cache(name, version_tag)
 
-    @purefunction
+    @purefunction_promote
     def _pure_lookup_where_with_method_cache(w_self, name, version_tag):
         space = w_self.space
         SHIFT = r_uint.BITS - space.config.objspace.std.methodcachesizeexp