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

Refactor code for obtaining the header block.

Browse Source
This commit is contained in:
Dan Gohman
2017-08-31 09:33:07 -07:00
parent fc374b6c06
commit 52186b8390
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/frontend/src/ssa.rs
View File

@@ -310,13 +310,8 @@ impl<Variable> SSABuilder<Variable>
/// Callers are expected to avoid adding the same predecessor more than once in the case /// Callers are expected to avoid adding the same predecessor more than once in the case
/// of a jump table. /// of a jump table.
pub fn declare_ebb_predecessor(&mut self, ebb: Ebb, pred: Block, inst: Inst) { pub fn declare_ebb_predecessor(&mut self, ebb: Ebb, pred: Block, inst: Inst) {
let header_block = match self.blocks[self.header_block(ebb)] { debug_assert!(!self.is_sealed(ebb));
BlockData::EbbBody { .. } => panic!("you can't add predecessors to an Ebb body block"), let header_block = self.header_block(ebb);
BlockData::EbbHeader(ref data) => {
assert!(!data.sealed);
self.header_block(ebb)
}
};
self.blocks[header_block].add_predecessor(pred, inst) self.blocks[header_block].add_predecessor(pred, inst)
} }
@@ -325,13 +320,8 @@ impl<Variable> SSABuilder<Variable>
/// ///
/// Note: use only when you know what you are doing, this might break the SSA bbuilding problem /// Note: use only when you know what you are doing, this might break the SSA bbuilding problem
pub fn remove_ebb_predecessor(&mut self, ebb: Ebb, inst: Inst) -> Block { pub fn remove_ebb_predecessor(&mut self, ebb: Ebb, inst: Inst) -> Block {
let header_block = match self.blocks[self.header_block(ebb)] { debug_assert!(!self.is_sealed(ebb));
BlockData::EbbBody { .. } => panic!("you can't add predecessors to an Ebb body block"), let header_block = self.header_block(ebb);
BlockData::EbbHeader(ref data) => {
assert!(!data.sealed);
self.header_block(ebb)
}
};
self.blocks[header_block].remove_predecessor(inst) self.blocks[header_block].remove_predecessor(inst)
} }
@@ -574,10 +564,7 @@ impl<Variable> SSABuilder<Variable>
/// Returns the list of `Ebb`s that have been declared as predecessors of the argument. /// Returns the list of `Ebb`s that have been declared as predecessors of the argument.
pub fn predecessors(&self, ebb: Ebb) -> &[(Block, Inst)] { pub fn predecessors(&self, ebb: Ebb) -> &[(Block, Inst)] {
let block = match self.ebb_headers[ebb].expand() { let block = self.header_block(ebb);
Some(block) => block,
None => panic!("the ebb has not been declared yet"),
};
match self.blocks[block] { match self.blocks[block] {
BlockData::EbbBody { .. } => panic!("should not happen"), BlockData::EbbBody { .. } => panic!("should not happen"),
BlockData::EbbHeader(ref data) => &data.predecessors, BlockData::EbbHeader(ref data) => &data.predecessors,