Author: Antonio Cuni <[email protected]>
Branch: autoreds
Changeset: r58857:42d832b4e1c3
Date: 2012-11-13 16:25 +0100
http://bitbucket.org/pypy/pypy/changeset/42d832b4e1c3/
Log: move autodetect_jit_markers_redvars out of
split_graph_and_record_jitdriver: it doesn't change anything, but it
just makes more sense to have it as a separate step
diff --git a/pypy/jit/metainterp/warmspot.py b/pypy/jit/metainterp/warmspot.py
--- a/pypy/jit/metainterp/warmspot.py
+++ b/pypy/jit/metainterp/warmspot.py
@@ -244,8 +244,9 @@
def find_portals(self):
self.jitdrivers_sd = []
graphs = self.translator.graphs
- for jit_merge_point_pos in find_jit_merge_points(graphs):
- self.split_graph_and_record_jitdriver(*jit_merge_point_pos)
+ for graph, block, pos in find_jit_merge_points(graphs):
+ self.autodetect_jit_markers_redvars(graph)
+ self.split_graph_and_record_jitdriver(graph, block, pos)
#
assert (len(set([jd.jitdriver for jd in self.jitdrivers_sd])) ==
len(self.jitdrivers_sd)), \
@@ -294,7 +295,6 @@
args = op.args[2:]
s_binding = self.translator.annotator.binding
jd._portal_args_s = [s_binding(v) for v in args]
- self.autodetect_jit_markers_redvars(graph)
graph = copygraph(graph)
[jmpp] = find_jit_merge_points([graph])
graph.startblock = support.split_before_jit_merge_point(*jmpp)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
