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

Fix checker: after moving edge-moves to prior to last branch of block (for simpler semantics for library user), we can no longer check blockparams; but this is fine because they do not exist in post-regalloc code.

Browse Source
This commit is contained in:
Chris Fallin
2021-05-09 19:38:20 -07:00
parent 4f26b1c78f
commit b7fd53efc5
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/checker.rs
View File

@@ -549,18 +549,24 @@ impl<'a, F: Function> Checker<'a, F> {
self.bb_insts.get_mut(&block).unwrap().push(checkinst); self.bb_insts.get_mut(&block).unwrap().push(checkinst);
} }
// Instruction itself. // Skip if this is a branch: the blockparams do not
let operands: Vec<_> = self.f.inst_operands(inst).iter().cloned().collect(); // exist in post-regalloc code, and the edge-moves
let allocs: Vec<_> = out.inst_allocs(inst).iter().cloned().collect(); // have to be inserted before the branch rather than
let clobbers: Vec<_> = self.f.inst_clobbers(inst).iter().cloned().collect(); // after.
let checkinst = CheckerInst::Op { if !self.f.is_branch(inst) {
inst, // Instruction itself.
operands, let operands: Vec<_> = self.f.inst_operands(inst).iter().cloned().collect();
allocs, let allocs: Vec<_> = out.inst_allocs(inst).iter().cloned().collect();
clobbers, let clobbers: Vec<_> = self.f.inst_clobbers(inst).iter().cloned().collect();
}; let checkinst = CheckerInst::Op {
debug!("checker: adding inst {:?}", checkinst); inst,
self.bb_insts.get_mut(&block).unwrap().push(checkinst); operands,
allocs,
clobbers,
};
debug!("checker: adding inst {:?}", checkinst);
self.bb_insts.get_mut(&block).unwrap().push(checkinst);
}
// Any inserted edits after instruction. // Any inserted edits after instruction.
self.handle_edits(block, out, &mut insert_idx, ProgPoint::after(inst)); self.handle_edits(block, out, &mut insert_idx, ProgPoint::after(inst));