[pypy-commit] lang-smalltalk strategies: merge tip

[timfel]

Author: Tim Felgentreff <timfelgentreff at gmail.com>
Branch: strategies
Changeset: r662:28eef032af8c
Date: 2014-03-18 15:28 +0100
http://bitbucket.org/pypy/lang-smalltalk/changeset/28eef032af8c/

Log:	merge tip

diff --git a/spyvm/shadow.py b/spyvm/shadow.py
--- a/spyvm/shadow.py
+++ b/spyvm/shadow.py
@@ -5,8 +5,6 @@
 from rpython.rlib import rarithmetic, jit
 from rpython.rlib.objectmodel import import_from_mixin
 from rpython.rlib.debug import make_sure_not_resized
-    elidable_func.func_name = "elidable_" + func.func_name
-    meth.func_name = "elidable_meth_" + func.func_name
 
 class AbstractShadow(object):
     """A shadow is an optional extra bit of information that
diff --git a/spyvm/version.py b/spyvm/version.py
--- a/spyvm/version.py
+++ b/spyvm/version.py
@@ -8,6 +8,8 @@
         return func(self, *args)
     def meth(self, *args):
         return elidable_func(self, self.version, *args)
+    elidable_func.func_name = "elidable_" + func.func_name
+    meth.func_name = "elidable_meth_" + func.func_name
     return meth
 
 # In addition to marking the decorated function as "pure", both the receiver