portal/waffle
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

WIP.

Browse source
This commit is contained in:
Chris Fallin 2021-12-11 22:33:15 -08:00
parent 6eb6297a2c
commit 71078fbe4d
1 changed files with 12 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/frontend.rs
View file

@ -171,8 +171,6 @@ struct LocalTracker {
cur_block: Option<BlockId>, cur_block: Option<BlockId>,
/// Is the given block sealed? /// Is the given block sealed?
block_sealed: FxHashSet<BlockId>, block_sealed: FxHashSet<BlockId>,
/// Block predecessors.
block_preds: FxHashMap<BlockId, Vec<BlockId>>,
/// The local-to-value mapping at the start of a block. /// The local-to-value mapping at the start of a block.
block_start: FxHashMap<BlockId, FxHashMap<LocalId, Value>>, block_start: FxHashMap<BlockId, FxHashMap<LocalId, Value>>,
/// The local-to-value mapping at the end of a block. /// The local-to-value mapping at the end of a block.
@ -187,15 +185,6 @@ impl LocalTracker {
assert!(!was_present); assert!(!was_present);
} }
pub fn add_pred(&mut self, block: BlockId, pred: BlockId) {
assert!(!self.block_sealed.contains(&block));
log::trace!("add_pred: block {} pred {}", block, pred);
self.block_preds
.entry(block)
.or_insert_with(|| vec![])
.push(pred);
}
pub fn start_block(&mut self, block: BlockId) { pub fn start_block(&mut self, block: BlockId) {
self.finish_block(); self.finish_block();
log::trace!("start_block: block {}", block); log::trace!("start_block: block {}", block);
@ -233,7 +222,6 @@ impl LocalTracker {
return; return;
} }
debug_assert!(self.is_sealed(self.cur_block.unwrap()));
log::trace!("set: local {} value {:?}", local, value); log::trace!("set: local {} value {:?}", local, value);
self.in_cur_block.insert(local, value); self.in_cur_block.insert(local, value);
} }
@ -262,12 +250,7 @@ impl LocalTracker {
} }
} }
if self if body.blocks[at_block].preds.is_empty() {
.block_preds
.get(&at_block)
.map(|preds| preds.is_empty())
.unwrap_or(true)
{
let value = self.create_default_value(body, ty); let value = self.create_default_value(body, ty);
log::trace!(" -> created default: {:?}", value); log::trace!(" -> created default: {:?}", value);
return value; return value;
@ -356,11 +339,7 @@ impl LocalTracker {
value value
); );
let mut results: Vec<Value> = vec![]; let mut results: Vec<Value> = vec![];
let preds = self let preds = body.blocks[block].preds.clone();
.block_preds
.get(&block)
.cloned()
.unwrap_or_else(|| vec![]);
for pred in preds { for pred in preds {
let pred_value = self.get_in_block(body, pred, local); let pred_value = self.get_in_block(body, pred, local);
log::trace!( log::trace!(
@ -398,12 +377,10 @@ impl LocalTracker {
value, value,
); );
body.replace_placeholder_with_blockparam(block, value); body.replace_placeholder_with_blockparam(block, value);
for (i, (pred, result)) in self for (i, (&pred, result)) in body.blocks[block]
.block_preds .preds
.get(&block) .clone()
.cloned() .iter()
.unwrap_or_else(|| vec![])
.into_iter()
.zip(results.into_iter()) .zip(results.into_iter())
.enumerate() .enumerate()
{ {
@ -996,6 +973,7 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
.collect::<Vec<_>>(); .collect::<Vec<_>>();
self.emit_cond_branch(cond, frame.br_target(), &args[..], cont, &[]); self.emit_cond_branch(cond, frame.br_target(), &args[..], cont, &[]);
self.cur_block = Some(cont); self.cur_block = Some(cont);
self.locals.seal_block_preds(cont, &mut self.body);
self.locals.start_block(cont); self.locals.start_block(cont);
} }
} }
@ -1073,7 +1051,7 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
); );
if let Some(block) = self.cur_block { if let Some(block) = self.cur_block {
let args = args.to_vec(); let args = args.to_vec();
self.locals.add_pred(target, block); self.body.add_edge(block, target);
let target = BlockTarget { let target = BlockTarget {
block: target, block: target,
args, args,
@ -1112,8 +1090,8 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
args: if_false_args, args: if_false_args,
}, },
}; };
self.locals.add_pred(if_true, block); self.body.add_edge(block, if_true);
self.locals.add_pred(if_false, block); self.body.add_edge(block, if_false);
} }
} }
@ -1149,9 +1127,9 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
}; };
for &target in indexed_targets { for &target in indexed_targets {
self.locals.add_pred(target, block); self.body.add_edge(block, target);
} }
self.locals.add_pred(default_target, block); self.body.add_edge(block, default_target);
self.body.blocks[block].terminator = Terminator::Select { self.body.blocks[block].terminator = Terminator::Select {
value: index, value: index,