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

Return the removed instruction from Cursor::remove_inst().

Browse Source 
This is convenient for asserting that the right instruction was removed.
This commit is contained in:
Jakob Stoklund Olesen
2017-04-13 08:18:16 -07:00
parent bcb3882ef6
commit 2e64bb88ba
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/cretonne/src/ir/layout.rs
View File

@@ -910,10 +910,13 @@ impl<'f> Cursor<'f> {
/// Remove the instruction under the cursor. /// Remove the instruction under the cursor.
/// ///
/// The cursor is left pointing at the position following the current instruction. /// The cursor is left pointing at the position following the current instruction.
pub fn remove_inst(&mut self) { ///
/// Return the instruction that was removed.
pub fn remove_inst(&mut self) -> Inst {
let inst = self.current_inst().expect("No instruction to remove"); let inst = self.current_inst().expect("No instruction to remove");
self.next_inst(); self.next_inst();
self.layout.remove_inst(inst); self.layout.remove_inst(inst);
inst
} }
/// Insert an EBB at the current position and switch to it. /// Insert an EBB at the current position and switch to it.
@@ -1180,10 +1183,10 @@ mod tests {
// Test remove_inst. // Test remove_inst.
cur.goto_inst(i2); cur.goto_inst(i2);
cur.remove_inst(); assert_eq!(cur.remove_inst(), i2);
verify(cur.layout, &[(e1, &[i1, i0])]); verify(cur.layout, &[(e1, &[i1, i0])]);
assert_eq!(cur.layout.inst_ebb(i2), None); assert_eq!(cur.layout.inst_ebb(i2), None);
cur.remove_inst(); assert_eq!(cur.remove_inst(), i0);
verify(cur.layout, &[(e1, &[i1])]); verify(cur.layout, &[(e1, &[i1])]);
assert_eq!(cur.layout.inst_ebb(i0), None); assert_eq!(cur.layout.inst_ebb(i0), None);
assert_eq!(cur.position(), CursorPosition::After(e1)); assert_eq!(cur.position(), CursorPosition::After(e1));