call_import changes: no more call_import, shared index space with functions

1 files changed, 11 insertions, 1 deletions

diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index 9abdea744..1a9e71bd4 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -1207,8 +1207,18 @@ private:
   }
 
   Expression* makeCall(Element& s) {
+    auto target = s[1]->str();
+    auto* import = wasm.checkImport(target);
+    if (import && import->kind == Import::Function) {
+      auto ret = allocator.alloc<CallImport>();
+      ret->target = target;
+      Import* import = wasm.getImport(ret->target);
+      ret->type = import->functionType->result;
+      parseCallOperands(s, 2, s.size(), ret);
+      return ret;
+    }
     auto ret = allocator.alloc<Call>();
-    ret->target = s[1]->str();
+    ret->target = target;
     ret->type = functionTypes[ret->target];
     parseCallOperands(s, 2, s.size(), ret);
     return ret;