Merge pull request #589 from WebAssembly/spec-fixes

Spec fixes

2 files changed, 4 insertions, 4 deletions

diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index 9024031d2..66aa2e625 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -351,14 +351,14 @@ private:
         NOTE_ENTER("CallIndirect");
         Flow target = visit(curr->target);
         if (target.breaking()) return target;
+        LiteralList arguments;
+        Flow flow = generateArguments(curr->operands, arguments);
+        if (flow.breaking()) return flow;
         size_t index = target.value.geti32();
         if (index >= instance.wasm.table.names.size()) trap("callIndirect: overflow");
         Name name = instance.wasm.table.names[index];
         Function *func = instance.wasm.getFunction(name);
         if (func->type.is() && func->type != curr->fullType) trap("callIndirect: bad type");
-        LiteralList arguments;
-        Flow flow = generateArguments(curr->operands, arguments);
-        if (flow.breaking()) return flow;
         if (func->params.size() != arguments.size()) trap("callIndirect: bad # of arguments");
         for (size_t i = 0; i < func->getNumLocals(); i++) {
           if (func->params[i] != arguments[i].type) trap("callIndirect: bad argument type");
diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index 97399233c..0893a5bba 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -495,7 +495,7 @@ private:
       makeFunction();
       body = allocator.alloc<Nop>();
     }
-    assert(currFunction->result == result);
+    if (currFunction->result != result) throw ParseException("bad func declaration", s.line, s.col);
     currFunction->body = body;
     currFunction->type = type;
     wasm.addFunction(currFunction.release());