make makeCallImport more similar to makeCall; do not assume all imports exist, let functions be created in a way independent from global state

kripken · kripken · commit 4ad7b4317d77 · 2016-06-26T10:04:46.000-07:00
diff --git a/src/ast_utils.h b/src/ast_utils.h
@@ -258,7 +258,7 @@ struct ExpressionManipulator {
         return ret;
       }
       Expression* visitCallImport(CallImport *curr) {
-        auto* ret = builder.makeCallImport(curr->target, {});
+        auto* ret = builder.makeCallImport(curr->target, {}, curr->type);
         for (Index i = 0; i < curr->operands.size(); i++) {
           ret->operands.push_back(copy(curr->operands[i]));
         }
diff --git a/src/wasm-builder.h b/src/wasm-builder.h
@@ -107,9 +107,9 @@ class Builder {
     call->operands.set(args);
     return call;
   }
-  CallImport* makeCallImport(Name target, const std::vector<Expression*>& args) {
+  CallImport* makeCallImport(Name target, const std::vector<Expression*>& args, WasmType type) {
     auto* call = wasm.allocator.alloc<CallImport>();
-    call->type = wasm.getImport(target)->type->result;
+    call->type = type; // similar to makeCall, for consistency
     call->target = target;
     call->operands.set(args);
     return call;
diff --git a/src/wasm-linker.cpp b/src/wasm-linker.cpp
@@ -396,7 +396,7 @@ Function* Linker::getImportThunk(Name name, const FunctionType* funcType) {
   for (Index i = 0; i < funcType->params.size(); ++i) {
     args.push_back(wasmBuilder.makeGetLocal(i, funcType->params[i]));
   }
-  Expression* call = wasmBuilder.makeCallImport(name, args);
+  Expression* call = wasmBuilder.makeCallImport(name, args, funcType->result);
   f->body = call;
   out.wasm.addFunction(f);
   return f;

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ struct ExpressionManipulator {`
`258`	`258`	`return ret;`
`259`	`259`	`}`
`260`	`260`	`Expression* visitCallImport(CallImport *curr) {`
`261`		`- auto* ret = builder.makeCallImport(curr->target, {});`
	`261`	`+ auto* ret = builder.makeCallImport(curr->target, {}, curr->type);`
`262`	`262`	`for (Index i = 0; i < curr->operands.size(); i++) {`
`263`	`263`	`ret->operands.push_back(copy(curr->operands[i]));`
`264`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@ Function* Linker::getImportThunk(Name name, const FunctionType* funcType) {`
`396`	`396`	`for (Index i = 0; i < funcType->params.size(); ++i) {`
`397`	`397`	`args.push_back(wasmBuilder.makeGetLocal(i, funcType->params[i]));`
`398`	`398`	`}`
`399`		`- Expression* call = wasmBuilder.makeCallImport(name, args);`
	`399`	`+ Expression* call = wasmBuilder.makeCallImport(name, args, funcType->result);`
`400`	`400`	`f->body = call;`
`401`	`401`	`out.wasm.addFunction(f);`
`402`	`402`	`return f;`