From 0d267afdf948de326055e58a94e5f48d9310a52a Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Thu, 7 Apr 2016 17:54:02 -0700 Subject: derecurse blocks helper, and use it in SimplifyLocals --- src/passes/SimplifyLocals.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/passes/SimplifyLocals.cpp') diff --git a/src/passes/SimplifyLocals.cpp b/src/passes/SimplifyLocals.cpp index 98806410f..5c7b7475a 100644 --- a/src/passes/SimplifyLocals.cpp +++ b/src/passes/SimplifyLocals.cpp @@ -45,16 +45,14 @@ struct SimplifyLocals : public WalkerPass> { void visitBlock(Block *curr) { // note locals, we can sink them from here TODO sink from elsewhere? - ExpressionList& list = curr->list; - for (size_t z = 0; z < list.size(); z++) { - walk(list[z]); - auto* item = list[z]; - if (item->is()) { - Name name = item->cast()->name; + derecurseBlocks(curr, [&](Block* block) {}, [&](Block* block, Expression*& child) { + walk(child); + if (child->is()) { + Name name = child->cast()->name; assert(sinkables.count(name) == 0); - sinkables.emplace(std::make_pair(name, SinkableInfo(&list[z]))); + sinkables.emplace(std::make_pair(name, SinkableInfo(&child))); } - } + }, [&](Block* block) {}); } void visitGetLocal(GetLocal *curr) { -- cgit v1.2.3