Author: Manuel Jacob <[email protected]>
Branch: llvm-translation-backend
Changeset: r81643:e58704ad4da5
Date: 2016-01-05 07:39 +0100
http://bitbucket.org/pypy/pypy/changeset/e58704ad4da5/
Log: Shuffle around some code in anticipation of the new llvmgcroot
implementation.
diff --git a/rpython/translator/llvm/genllvm.py
b/rpython/translator/llvm/genllvm.py
--- a/rpython/translator/llvm/genllvm.py
+++ b/rpython/translator/llvm/genllvm.py
@@ -972,12 +972,7 @@
def prepare_graph(self, ptr_type, name, graph):
genllvm = database.genllvm
genllvm.gcpolicy.gctransformer.inline_helpers(graph)
- self.transform_gc_reload_possibly_moved(graph)
-
- remove_double_links(graph)
- no_links_to_startblock(graph)
remove_same_as(graph)
- SSI_to_SSA(graph)
llvmgcroot = genllvm.translator.config.translation.gcrootfinder == \
'llvmgcroot'
@@ -989,7 +984,12 @@
prevent_inline = (name == '@rpy_walk_stack_roots' or
name.startswith('@rpy_stack_check'))
else:
+ self.transform_gc_reload_possibly_moved(graph)
prevent_inline = False
+
+ remove_double_links(graph)
+ no_links_to_startblock(graph)
+ SSI_to_SSA(graph)
return prevent_inline, llvmgcroot
def transform_gc_reload_possibly_moved(self, graph):
diff --git a/rpython/translator/llvm/test/test_genllvm.py
b/rpython/translator/llvm/test/test_genllvm.py
--- a/rpython/translator/llvm/test/test_genllvm.py
+++ b/rpython/translator/llvm/test/test_genllvm.py
@@ -713,12 +713,14 @@
def _set_backend(cls, t):
t.ensure_backend('llvm')
+
class DisabledTestMiniMarkGCLLVMGCRoot(test_newgc.TestMiniMarkGC):
@classmethod
def _set_backend(cls, t):
t.ensure_backend('llvm')
t.ensure_opt('gcrootfinder', 'llvmgcroot')
+
class TestMiniMarkGCMostCompactLLVM(test_newgc.TestMiniMarkGCMostCompact):
@classmethod
def _set_backend(cls, t):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
