Merge branch 'master' of github.com:stoklund/cretonne into cfg-fix

This commit is contained in:
Morgan Phillips
2016-08-01 18:06:59 -07:00

View File

@@ -41,8 +41,8 @@ impl<T: Write> CFGPrinter<T> {
self.header(func); self.header(func);
self.push_indent(); self.push_indent();
self.ebb_subgraphs(func); self.ebb_subgraphs(func);
let cfg = ControlFlowGraph::new(&func); let cfg = ControlFlowGraph::new(func);
self.cfg_connections(&cfg); self.cfg_connections(func, &cfg);
self.pop_indent(); self.pop_indent();
self.footer(); self.footer();
self.write() self.write()
@@ -145,9 +145,9 @@ impl<T: Write> CFGPrinter<T> {
} }
} }
fn cfg_connections(&mut self, cfg: &ControlFlowGraph) { fn cfg_connections(&mut self, func: &Function, cfg: &ControlFlowGraph) {
for (ref ebb, ref predecessors) in cfg.predecessors_iter() { for ebb in &func.layout {
for &(parent, inst) in *predecessors { for &(parent, inst) in cfg.get_predecessors(ebb) {
self.append(&format!("{}:{} -> {}", parent, inst, ebb)); self.append(&format!("{}:{} -> {}", parent, inst, ebb));
self.newline(); self.newline();
} }