summaryrefslogtreecommitdiff
path: root/src/asm2wasm.h
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2016-03-22 10:55:07 -0700
committerAlon Zakai <alonzakai@gmail.com>2016-03-22 10:55:07 -0700
commit94bf9d12986fb069323738247bea5a480cfd8ef6 (patch)
treeaa9a88a20ebd6d199f67853ab88fc0fa91b972df /src/asm2wasm.h
parent232327c1a687fa7571dac7c4742a3db1b2a7e166 (diff)
parent49a5fedf0e9ab16d294d9aba860a0375fc4debd9 (diff)
downloadbinaryen-94bf9d12986fb069323738247bea5a480cfd8ef6.tar.gz
binaryen-94bf9d12986fb069323738247bea5a480cfd8ef6.tar.bz2
binaryen-94bf9d12986fb069323738247bea5a480cfd8ef6.zip
Merge pull request #272 from WebAssembly/asm2wasm-fix
asm2wasm fix
Diffstat (limited to 'src/asm2wasm.h')
-rw-r--r--src/asm2wasm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/asm2wasm.h b/src/asm2wasm.h
index c994d0ef2..4c37b7705 100644
--- a/src/asm2wasm.h
+++ b/src/asm2wasm.h
@@ -419,8 +419,9 @@ private:
return nullptr;
}
+ // ensure a nameless block
Block* blockify(Expression* expression) {
- if (expression->is<Block>()) return expression->dyn_cast<Block>();
+ if (expression->is<Block>() && !expression->cast<Block>()->name.is()) return expression->dyn_cast<Block>();
auto ret = allocator.alloc<Block>();
ret->list.push_back(expression);
ret->finalize();