Remove all unsafe linker flags from Package.swift

Author: kateinoigakukun

.swift-version

@@ -1 +1 @@
-wasm-5.3-SNAPSHOT-2020-08-10-a
+wasm-5.3-SNAPSHOT-2020-10-02-a

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.2
 
 import PackageDescription
 
@@ -10,34 +10,8 @@ let package = Package(
     targets: [
         .target(
             name: "JavaScriptKit",
-            dependencies: ["_CJavaScriptKit"],
-            linkerSettings: [
-                .unsafeFlags(
-                    [
-                        "-Xlinker",
-                        "--export=swjs_call_host_function",
-                        "-Xlinker",
-                        "--export=swjs_prepare_host_function_call",
-                        "-Xlinker",
-                        "--export=swjs_cleanup_host_function_call",
-                        "-Xlinker",
-                        "--export=swjs_library_version",
-                    ],
-                    .when(platforms: [.wasi])
-                ),
-            ]
-        ),
-        .target(
-            name: "_CJavaScriptKit",
-            linkerSettings: [
-                .unsafeFlags(
-                    [
-                        "-Xlinker",
-                        "--allow-undefined",
-                    ],
-                    .when(platforms: [.wasi])
-                ),
-            ]
+            dependencies: ["_CJavaScriptKit"]
         ),
+        .target(name: "_CJavaScriptKit"),
     ]
 )

[email protected]

@@ -190,19 +190,8 @@ public class JSClosure: JSFunction {
 // │                     │                          │
 // └─────────────────────┴──────────────────────────┘
 
-@_cdecl("swjs_prepare_host_function_call")
-func _prepare_host_function_call(_ argc: Int32) -> UnsafeMutableRawPointer {
-    let argumentSize = MemoryLayout<RawJSValue>.size * Int(argc)
-    return malloc(Int(argumentSize))!
-}
-
-@_cdecl("swjs_cleanup_host_function_call")
-func _cleanup_host_function_call(_ pointer: UnsafeMutableRawPointer) {
-    free(pointer)
-}
-
-@_cdecl("swjs_call_host_function")
-func _call_host_function(
+@_cdecl("_call_host_function_impl")
+func _call_host_function_impl(
     _ hostFuncRef: JavaScriptHostFuncRef,
     _ argv: UnsafePointer<RawJSValue>, _ argc: Int32,
     _ callbackFuncRef: JavaScriptObjectRef

Sources/JavaScriptKit/Compatibility.swift

@@ -0,0 +1,31 @@
+#include "_CJavaScriptKit.h"
+#include <stdlib.h>
+
+void _call_host_function_impl(const JavaScriptHostFuncRef host_func_ref,
+                              const RawJSValue *argv, const int argc,
+                              const JavaScriptObjectRef callback_func);
+
+__attribute__((export_name("swjs_call_host_function")))
+void _call_host_function(const JavaScriptHostFuncRef host_func_ref,
+                         const RawJSValue *argv, const int argc,
+                         const JavaScriptObjectRef callback_func) {
+    _call_host_function_impl(host_func_ref, argv, argc, callback_func);
+}
+
+__attribute__((export_name("swjs_prepare_host_function_call")))
+void *_prepare_host_function_call(const int argc) {
+    return malloc(argc * sizeof(RawJSValue));
+}
+
+__attribute__((export_name("swjs_cleanup_host_function_call")))
+void _cleanup_host_function_call(void *argv_buffer) {
+    free(argv_buffer);
+}
+
+/// The compatibility runtime library version.
+/// Notes: If you change any interface of runtime library, please increment
+/// this and `SwiftRuntime.version` in `./Runtime/src/index.ts`.
+__attribute__((export_name("swjs_library_version")))
+int _library_version() {
+    return 700;
+}