Author: Maciej Fijalkowski <[email protected]>
Branch: jitframe-on-heap
Changeset: r60618:38ad7fc1383e
Date: 2013-01-28 18:14 +0200
http://bitbucket.org/pypy/pypy/changeset/38ad7fc1383e/
Log: kill jit2gc['root_iterator']
diff --git a/rpython/rtyper/memory/gctransform/shadowstack.py
b/rpython/rtyper/memory/gctransform/shadowstack.py
--- a/rpython/rtyper/memory/gctransform/shadowstack.py
+++ b/rpython/rtyper/memory/gctransform/shadowstack.py
@@ -268,12 +268,6 @@
self.gc_start_fresh_new_state_ptr = getfn(gc_start_fresh_new_state,
[], annmodel.s_None,
inline=True)
- # fish...
- translator = gctransformer.translator
- if hasattr(translator, '_jit2gc'):
- from rpython.rlib._rffi_stacklet import _translate_pointer
- root_iterator = translator._jit2gc['root_iterator']
- root_iterator.translateptr = _translate_pointer
# ____________________________________________________________
@@ -366,23 +360,18 @@
def get_root_iterator(gctransformer):
if hasattr(gctransformer, '_root_iterator'):
return gctransformer._root_iterator # if already built
- translator = gctransformer.translator
- if (hasattr(translator, '_jit2gc') and
- 'root_iterator' in translator._jit2gc):
- result = translator._jit2gc['root_iterator']
- else:
- class RootIterator(object):
- def _freeze_(self):
- return True
- def setcontext(self, context):
- pass
- def nextleft(self, gc, start, addr):
- while addr != start:
- addr -= sizeofaddr
- if gc.points_to_valid_gc_object(addr):
- return addr
- return llmemory.NULL
- result = RootIterator()
+ class RootIterator(object):
+ def _freeze_(self):
+ return True
+ def setcontext(self, context):
+ pass
+ def nextleft(self, gc, start, addr):
+ while addr != start:
+ addr -= sizeofaddr
+ if gc.points_to_valid_gc_object(addr):
+ return addr
+ return llmemory.NULL
+ result = RootIterator()
gctransformer._root_iterator = result
return result
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
