summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2016-01-27 13:45:38 -0800
committerAlon Zakai <alonzakai@gmail.com>2016-01-27 13:48:32 -0800
commit24992f477f21167efafdc8d5f1a2a9fd197baab6 (patch)
tree4a6c67f00f1d20d2ebbeb53c57cf7cf72f6d10b1 /src
parentf0dd7c4c98566751a63807572b9ca66b294ef434 (diff)
downloadbinaryen-24992f477f21167efafdc8d5f1a2a9fd197baab6.tar.gz
binaryen-24992f477f21167efafdc8d5f1a2a9fd197baab6.tar.bz2
binaryen-24992f477f21167efafdc8d5f1a2a9fd197baab6.zip
parse 0-size blocks
Diffstat (limited to 'src')
-rw-r--r--src/wasm-binary.h4
-rw-r--r--src/wasm-s-parser.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/wasm-binary.h b/src/wasm-binary.h
index 08be2019a..10bd40ece 100644
--- a/src/wasm-binary.h
+++ b/src/wasm-binary.h
@@ -1275,9 +1275,7 @@ public:
readExpression(child);
curr->list.push_back(child);
}
- if (num == 0) {
- curr->type = none;
- } else {
+ if (num > 0) {
curr->type = curr->list.back()->type;
}
breakStack.pop_back();
diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index 242a4b5a9..65c06ab6f 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -705,7 +705,7 @@ private:
ret->list.push_back(parseExpression(s[i]));
}
labelStack.pop_back();
- ret->type = ret->list.back()->type;
+ if (ret->list.size() > 0) ret->type = ret->list.back()->type;
return ret;
}