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

Bugfix to localify: properly handle workqueue dedup (actually remove from set when popping from queue)

Browse source
This commit is contained in:
Chris Fallin 2023-02-26 00:25:33 -08:00
parent b675f04a5f
commit 8145c6bca7
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/backend/localify.rs
View file

@ -100,12 +100,13 @@ impl<'a, V: Visitor> BlockVisitor<'a, V> {
self.visit_use(arg); self.visit_use(arg);
} }
} }
// Otherwise, it may be an alias (but resolved above) or
// PickOutput, which we "see through" in handle_use of
// consumers.
} }
fn visit_use(&mut self, value: Value) { fn visit_use(&mut self, value: Value) {
let value = self.body.resolve_alias(value); let value = self.body.resolve_alias(value);
if let ValueDef::PickOutput(value, _, _) = self.body.values[value] {
self.visit_use(value);
return;
}
if self.trees.owner.contains_key(&value) { if self.trees.owner.contains_key(&value) {
// If this is a treeified value, then don't process the use, // If this is a treeified value, then don't process the use,
// but process the instruction directly here. // but process the instruction directly here.
@ -154,6 +155,7 @@ impl<'a> Context<'a> {
let mut workqueue: Vec<Block> = self.cfg.rpo.values().cloned().collect(); let mut workqueue: Vec<Block> = self.cfg.rpo.values().cloned().collect();
let mut workqueue_set: HashSet<Block> = workqueue.iter().cloned().collect(); let mut workqueue_set: HashSet<Block> = workqueue.iter().cloned().collect();
while let Some(block) = workqueue.pop() { while let Some(block) = workqueue.pop() {
workqueue_set.remove(&block);
let live = self.block_end_live[block].clone(); let live = self.block_end_live[block].clone();
let mut visitor = BlockVisitor::new(self.body, self.trees, LivenessVisitor { live }); let mut visitor = BlockVisitor::new(self.body, self.trees, LivenessVisitor { live });
visitor.visit_block(block); visitor.visit_block(block);