summaryrefslogtreecommitdiff
path: root/src/wasm-js.cpp
diff options
context:
space:
mode:
authorDerek Schuff <dschuff@chromium.org>2016-02-01 13:14:14 -0800
committerDerek Schuff <dschuff@chromium.org>2016-02-01 13:14:14 -0800
commitf18096a0d7d355499a218e1ff4196b296a1f82b1 (patch)
treee670d0905bce166150eecd18cec1edea396e169d /src/wasm-js.cpp
parentb4e04afe0a74edf35642908e715e2497f6c18e7f (diff)
parentf275618272a6a5802458beea2e66491d207e14f5 (diff)
downloadbinaryen-f18096a0d7d355499a218e1ff4196b296a1f82b1.tar.gz
binaryen-f18096a0d7d355499a218e1ff4196b296a1f82b1.tar.bz2
binaryen-f18096a0d7d355499a218e1ff4196b296a1f82b1.zip
Merge pull request #157 from WebAssembly/test_branch
Update LLVM build to 2566
Diffstat (limited to 'src/wasm-js.cpp')
-rw-r--r--src/wasm-js.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp
index b767b8a25..067e3fdea 100644
--- a/src/wasm-js.cpp
+++ b/src/wasm-js.cpp
@@ -200,7 +200,7 @@ extern "C" void EMSCRIPTEN_KEEPALIVE instantiate() {
}
Literal load(Load* load, size_t addr) override {
- assert(load->align == load->bytes);
+ assert(load->align >= load->bytes);
if (!isWasmTypeFloat(load->type)) {
if (load->bytes == 1) {
if (load->signed_) {
@@ -233,7 +233,7 @@ extern "C" void EMSCRIPTEN_KEEPALIVE instantiate() {
}
void store(Store* store, size_t addr, Literal value) override {
- assert(store->align == store->bytes);
+ assert(store->align >= store->bytes);
if (!isWasmTypeFloat(store->type)) {
if (store->bytes == 1) {
EM_ASM_INT({ Module['info'].parent['HEAP8'][$0] = $1 }, addr, value.geti32());