Author: David Schneider <david.schnei...@picle.org>
Branch:
Changeset: r63311:862eefdcacca
Date: 2013-04-13 16:33 +0200
http://bitbucket.org/pypy/pypy/changeset/862eefdcacca/
Log: merge heads
diff --git a/rpython/translator/backendopt/inline.py
b/rpython/translator/backendopt/inline.py
--- a/rpython/translator/backendopt/inline.py
+++ b/rpython/translator/backendopt/inline.py
@@ -777,7 +777,10 @@
heuristic=inlining_heuristic,
inline_graph_from_anywhere=False):
if inline_graph_from_anywhere:
- ok_to_call = set(translator.graphs)
+ # it's ok to inline calls to any graph, with the exception of
+ # graphs that would be already exception-transformed
+ ok_to_call = set([graph for graph in translator.graphs
+ if not hasattr(graph, 'exceptiontransformed')])
else:
ok_to_call = None
callgraph = inlinable_static_callers(graphs, ok_to_call=ok_to_call)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
