Remove JSC for now

Author: kabiroberai

tools/swift-plugin-server/CMakeLists.txt

@@ -6,25 +6,8 @@ if (SWIFT_BUILD_SWIFT_SYNTAX)
   FetchContent_Declare(WasmKit SOURCE_DIR "${PROJECT_SOURCE_DIR}/../wasmkit")
   FetchContent_MakeAvailable(WasmKit)
 
-  set(SWIFT_WASM_ALLOW_JSC ON CACHE BOOL "Use JavaScriptCore Wasm runtime if possible" FORCE)
-
-  if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
-    set(swift_wasm_use_jsc ${SWIFT_WASM_ALLOW_JSC})
-  else()
-    set(swift_wasm_use_jsc OFF)
-  endif()
-
-  if (swift_wasm_use_jsc)
-    set(wasi_dep WASI)
-    set(jsc_defines SWIFT_WASM_USE_JSC)
-  else()
-    set(wasi_dep WasmKitWASI)
-    set(jsc_defines)
-  endif()
-
   add_pure_swift_host_tool(swift-plugin-server
     Sources/swift-plugin-server/swift-plugin-server.swift
-    Sources/swift-plugin-server/JSCWasmEngine.swift
     Sources/swift-plugin-server/WasmEngine.swift
     Sources/swift-plugin-server/WasmKitEngine.swift
     Sources/swift-plugin-server/WasmMessageHandler.swift
@@ -33,14 +16,7 @@ if (SWIFT_BUILD_SWIFT_SYNTAX)
     SWIFT_DEPENDENCIES
       SwiftCompilerPluginMessageHandling
       SwiftLibraryPluginProvider
+      SystemPackage
       ${wasi_dep}
   )
-
-  target_compile_definitions(swift-plugin-server PRIVATE ${jsc_defines})
-
-  if (swift_wasm_use_jsc)
-    add_custom_command(TARGET swift-plugin-server POST_BUILD COMMAND
-      codesign -fs - $<TARGET_FILE:swift-plugin-server> --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/allow-jit.plist
-    )
-  endif()
 endif()

tools/swift-plugin-server/Package.swift

@@ -2,8 +2,6 @@
 
 import PackageDescription
 
-let allowJSC = true
-
 let package = Package(
   name: "swift-plugin-server",
   platforms: [
@@ -20,11 +18,8 @@ let package = Package(
         .product(name: "SwiftCompilerPluginMessageHandling", package: "swift-syntax"),
         .product(name: "SwiftLibraryPluginProvider", package: "swift-syntax"),
         .product(name: "WASI", package: "WasmKit"),
-        .product(name: "WasmKitWASI", package: "WasmKit", condition: .when(
-            platforms: [.linux, .windows] + (allowJSC ? [] : [.macOS])
-        )),
-      ],
-      swiftSettings: allowJSC ? [.define("SWIFT_WASM_USE_JSC", .when(platforms: [.macOS]))] : []
+        .product(name: "WasmKitWASI", package: "WasmKit"),
+      ]
     ),
   ],
   cxxLanguageStandard: .cxx17

tools/swift-plugin-server/Sources/swift-plugin-server/JSCWasmEngine.swift

@@ -10,8 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if !SWIFT_WASM_USE_JSC
-
 import WASI
 import WasmKit
 import WasmKitWASI
@@ -39,5 +37,3 @@ struct WasmKitEngine: WasmEngine {
     return { args in try function.invoke(args.map(Value.i32), runtime: runtime).map(\.i32) }
   }
 }
-
-#endif