summaryrefslogtreecommitdiff
path: root/src/passes/MergeBlocks.cpp
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2018-02-02 18:47:10 -0800
committerGitHub <noreply@github.com>2018-02-02 18:47:10 -0800
commit6b05f000e8b9249afd0838774b6bdaf64fcaf90a (patch)
treeac9c331c10c72da23429dcd64a47b47bc40aa34b /src/passes/MergeBlocks.cpp
parentc81857a3a7708738b20bb28a320fc971e74626a7 (diff)
downloadbinaryen-6b05f000e8b9249afd0838774b6bdaf64fcaf90a.tar.gz
binaryen-6b05f000e8b9249afd0838774b6bdaf64fcaf90a.tar.bz2
binaryen-6b05f000e8b9249afd0838774b6bdaf64fcaf90a.zip
Rename WasmType => Type (#1398)
* rename WasmType to Type. it's in the wasm:: namespace anyhow, and without Wasm- it fits in better alongside Index, Address, Expression, Module, etc.
Diffstat (limited to 'src/passes/MergeBlocks.cpp')
-rw-r--r--src/passes/MergeBlocks.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/passes/MergeBlocks.cpp b/src/passes/MergeBlocks.cpp
index 798ad927f..2f59de539 100644
--- a/src/passes/MergeBlocks.cpp
+++ b/src/passes/MergeBlocks.cpp
@@ -148,7 +148,7 @@ struct BreakValueDropper : public ControlFlowWalker<BreakValueDropper> {
void visitDrop(Drop* curr) {
// if we dropped a br_if whose value we removed, then we are now dropping a (block (drop value) (br_if)) with type none, which does not need a drop
// likewise, unreachable does not need to be dropped, so we just leave drops of concrete values
- if (!isConcreteWasmType(curr->value->type)) {
+ if (!isConcreteType(curr->value->type)) {
replaceCurrent(curr->value);
}
}
@@ -228,7 +228,7 @@ static void optimizeBlock(Block* curr, Module* module, PassOptions& passOptions)
if (!merged.empty()) {
auto* last = merged.back();
for (auto*& item : merged) {
- if (item != last && isConcreteWasmType(item->type)) {
+ if (item != last && isConcreteType(item->type)) {
Builder builder(*module);
item = builder.makeDrop(item);
}