wasm2c: Remove implicit void* conversions in tail calls

Author: shravanrn

src/c-writer.cc

@@ -528,6 +528,8 @@ class CWriter {
   std::vector<const Import*> unique_imports_;
   SymbolSet import_module_set_;       // modules that are imported from
   SymbolSet import_func_module_set_;  // modules that funcs are imported from
+  SymbolMap import_func_module_map_;  // mapping between imported functions and
+                                      // their modules
 
   std::vector<std::pair<std::string, MemoryStream>> func_sections_;
   SymbolSet func_includes_;
@@ -1777,6 +1779,8 @@ void CWriter::ComputeUniqueImports() {
     import_module_set_.insert(import->module_name);
     if (import->kind() == ExternalKind::Func) {
       import_func_module_set_.insert(import->module_name);
+      import_func_module_map_.emplace(cast<FuncImport>(import)->func.name,
+                                      import->module_name);
     }
   }
 
@@ -2351,7 +2355,17 @@ void CWriter::WriteFuncRefWrapper(const Func* func) {
   Write(") ", OpenBrace());
   Write("return ");
   Write(ExternalRef(ModuleFieldType::Func, func->name));
-  Write("(instance");
+
+  std::string target_module_name;
+  if (IsImport(func->name)) {
+    std::string external_module = import_func_module_map_[func->name];
+    assert(external_module != "");
+    target_module_name = ModuleInstanceTypeName(external_module);
+  } else {
+    target_module_name = ModuleInstanceTypeName();
+  }
+
+  Write("((struct ", target_module_name, "*) instance");
   if (func->GetNumParams() != 0) {
     Indent(4);
     for (Index i = 0; i < func->GetNumParams(); ++i) {

test/wasm2c/check-imports.txt

@@ -831,7 +831,7 @@ FUNC_TYPE_T(w2c_test_t1) = "\x72\xab\x00\xdf\x20\x3d\xce\xa1\xf2\x29\xc7\x9d\x13
 FUNC_TYPE_T(w2c_test_t2) = "\x92\xfb\x6a\xdf\x49\x07\x0a\x83\xbe\x08\x02\x68\xcd\xf6\x95\x27\x4a\xc2\xf3\xe5\xe4\x7d\x29\x49\xe8\xed\x42\x92\x6a\x9d\xda\xf0";
 
 static u32 wrap_w2c_test_f1(void *instance) {
-  return w2c_test_f1(instance);
+  return w2c_test_f1((struct w2c_test*) instance);
 }
 
 static void init_memories(w2c_test* instance) {

test/wasm2c/hello.txt

@@ -836,7 +836,7 @@ FUNC_TYPE_T(w2c_test_t1) = "\x89\x3a\x3d\x2c\x8f\x4d\x7f\x6d\x6c\x9d\x62\x67\x29
 FUNC_TYPE_T(w2c_test_t2) = "\x36\xa9\xe7\xf1\xc9\x5b\x82\xff\xb9\x97\x43\xe0\xc5\xc4\xce\x95\xd8\x3c\x9a\x43\x0a\xac\x59\xf8\x4e\xf3\xcb\xfa\xb6\x14\x50\x68";
 
 static u32 wrap_w2c_wasi__snapshot__preview1_fd_write(void *instance, u32 var_0, u32 var_1, u32 var_2, u32 var_3) {
-  return w2c_wasi__snapshot__preview1_fd_write(instance, var_0, var_1, var_2, var_3);
+  return w2c_wasi__snapshot__preview1_fd_write((struct w2c_wasi__snapshot__preview1*) instance, var_0, var_1, var_2, var_3);
 }
 
 static const u8 data_segment_data_w2c_test_d0[] = {

test/wasm2c/tail-calls.txt

@@ -839,7 +839,7 @@ FUNC_TYPE_T(w2c_test_t1) = "\x36\xa9\xe7\xf1\xc9\x5b\x82\xff\xb9\x97\x43\xe0\xc5
 FUNC_TYPE_T(w2c_test_t2) = "\xe5\x11\x86\xc7\x24\xdb\x44\x80\xbe\xd1\xe0\x89\xbc\xc0\x20\xea\xfb\x1c\x9a\x27\xa5\xc3\xdb\xca\x5d\xb0\x05\x0f\x7c\x03\x74\x0a";
 
 static void wrap_w2c_spectest_print_i32_f32(void *instance, u32 var_0, f32 var_1) {
-  return w2c_spectest_print_i32_f32(instance, var_0, var_1);
+  return w2c_spectest_print_i32_f32((struct w2c_spectest*) instance, var_0, var_1);
 }
 
 static const wasm_elem_segment_expr_t elem_segment_exprs_w2c_test_e0[] = {