Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: exctrans
Changeset: r81577:6b9bb2fbc629
Date: 2016-01-05 13:39 +0100
http://bitbucket.org/pypy/pypy/changeset/6b9bb2fbc629/
Log: simplify code: always patch the graph in-place in funcgen
diff --git a/rpython/translator/c/funcgen.py b/rpython/translator/c/funcgen.py
--- a/rpython/translator/c/funcgen.py
+++ b/rpython/translator/c/funcgen.py
@@ -92,17 +92,14 @@
def name(self, cname): #virtual
return cname
- def patch_graph(self, copy_graph):
+ def patch_graph(self):
graph = self.graph
if self.db.gctransformer and self.db.gctransformer.inline:
- if copy_graph:
- graph = copygraph(graph, shallow=True)
self.db.gctransformer.inline_helpers(graph)
return graph
def implementation_begin(self):
- self.oldgraph = self.graph
- self.graph = self.patch_graph(copy_graph=True)
+ self.patch_graph()
SSI_to_SSA(self.graph)
self.collect_var_and_types()
self.blocknum = {}
@@ -128,8 +125,6 @@
self.vars = None
self.blocknum = None
self.innerloops = None
- self.graph = self.oldgraph
- del self.oldgraph
def argnames(self):
return [LOCALVAR % v.name for v in self.graph.getargs()]
diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -205,7 +205,7 @@
for node in db.containerlist:
if hasattr(node, 'funcgens'):
for funcgen in node.funcgens:
- funcgen.patch_graph(copy_graph=False)
+ funcgen.patch_graph()
return db
def generate_source(self, db=None, defines={}, exe_name=None):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
