T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate layout::Cursor from cton_frontend.

Browse Source 
Replace all uses with a FuncCursor.

Avoid the anti-pattern of passing parts of a function around as
independent references.
This commit is contained in:
Jakob Stoklund Olesen
2017-09-21 12:16:32 -07:00
parent 03dee5e442
commit 1cd91b6f30
4 changed files with 172 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/cretonne/src/loop_analysis.rs
View File

@@ -223,7 +223,8 @@ impl LoopAnalysis {
#[cfg(test)]
mod test {
use ir::{Function, InstBuilder, Cursor, CursorBase, types};
use cursor::{Cursor, FuncCursor};
use ir::{Function, InstBuilder, types};
use loop_analysis::{Loop, LoopAnalysis};
use flowgraph::ControlFlowGraph;
use dominator_tree::DominatorTree;
@@ -238,21 +239,20 @@ mod test {
let cond = func.dfg.append_ebb_arg(ebb0, types::I32);
{
let dfg = &mut func.dfg;
let cur = &mut Cursor::new(&mut func.layout);
let mut cur = FuncCursor::new(&mut func);
cur.insert_ebb(ebb0);
dfg.ins(cur).jump(ebb1, &[]);
cur.ins().jump(ebb1, &[]);
cur.insert_ebb(ebb1);
dfg.ins(cur).jump(ebb2, &[]);
cur.ins().jump(ebb2, &[]);
cur.insert_ebb(ebb2);
dfg.ins(cur).brnz(cond, ebb1, &[]);
dfg.ins(cur).jump(ebb3, &[]);
cur.ins().brnz(cond, ebb1, &[]);
cur.ins().jump(ebb3, &[]);
cur.insert_ebb(ebb3);
dfg.ins(cur).brnz(cond, ebb0, &[]);
cur.ins().brnz(cond, ebb0, &[]);
}
@@ -291,29 +291,28 @@ mod test {
let cond = func.dfg.append_ebb_arg(ebb0, types::I32);
{
let dfg = &mut func.dfg;
let cur = &mut Cursor::new(&mut func.layout);
let mut cur = FuncCursor::new(&mut func);
cur.insert_ebb(ebb0);
dfg.ins(cur).brnz(cond, ebb1, &[]);
dfg.ins(cur).jump(ebb3, &[]);
cur.ins().brnz(cond, ebb1, &[]);
cur.ins().jump(ebb3, &[]);
cur.insert_ebb(ebb1);
dfg.ins(cur).jump(ebb2, &[]);
cur.ins().jump(ebb2, &[]);
cur.insert_ebb(ebb2);
dfg.ins(cur).brnz(cond, ebb1, &[]);
dfg.ins(cur).jump(ebb5, &[]);
cur.ins().brnz(cond, ebb1, &[]);
cur.ins().jump(ebb5, &[]);
cur.insert_ebb(ebb3);
dfg.ins(cur).jump(ebb4, &[]);
cur.ins().jump(ebb4, &[]);
cur.insert_ebb(ebb4);
dfg.ins(cur).brnz(cond, ebb3, &[]);
dfg.ins(cur).jump(ebb5, &[]);
cur.ins().brnz(cond, ebb3, &[]);
cur.ins().jump(ebb5, &[]);
cur.insert_ebb(ebb5);
dfg.ins(cur).brnz(cond, ebb0, &[]);
cur.ins().brnz(cond, ebb0, &[]);
}