[pypy-commit] pypy jitframe-on-heap: Fix.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: jitframe-on-heap
Changeset: r61965:152ee9d80952
Date: 2013-03-03 20:02 +0100
http://bitbucket.org/pypy/pypy/changeset/152ee9d80952/

Log:	Fix.

diff --git a/rpython/memory/gctransform/asmgcroot.py b/rpython/memory/gctransform/asmgcroot.py
--- a/rpython/memory/gctransform/asmgcroot.py
+++ b/rpython/memory/gctransform/asmgcroot.py
@@ -145,6 +145,7 @@
         # stacklet support: BIG HACK for rlib.rstacklet
         from rpython.rlib import _stacklet_asmgcc
         _stacklet_asmgcc._asmstackrootwalker = self     # as a global! argh
+        _stacklet_asmgcc.complete_destrptr(gctransformer)
 
     def need_thread_support(self, gctransformer, getfn):
         # Threads supported "out of the box" by the rest of the code.
diff --git a/rpython/memory/gctransform/transform.py b/rpython/memory/gctransform/transform.py
--- a/rpython/memory/gctransform/transform.py
+++ b/rpython/memory/gctransform/transform.py
@@ -281,10 +281,6 @@
     def finish_helpers(self, backendopt=True):
         if self.translator is not None:
             self.mixlevelannotator.finish_annotate()
-            if hasattr(self, '_hack_call_later'):
-                f = self._hack_call_later
-                del self._hack_call_later
-                f(self)
         self.finished_helpers = True
         if self.translator is not None:
             self.mixlevelannotator.finish_rtype()
diff --git a/rpython/rlib/_stacklet_asmgcc.py b/rpython/rlib/_stacklet_asmgcc.py
--- a/rpython/rlib/_stacklet_asmgcc.py
+++ b/rpython/rlib/_stacklet_asmgcc.py
@@ -127,7 +127,6 @@
             return _c._translate_pointer(self.context, addr)
 
     _stackletrootwalker = StackletRootWalker()
-    _asmstackrootwalker.gctransformer._hack_call_later = complete_destrptr
     return _stackletrootwalker
 get_stackletrootwalker._annspecialcase_ = 'specialize:memo'