Merge pull request #73458 from rintaro/6.0-macros-library-provider

[6.0] Macro plugin related changes

Author: rintaro

lib/ASTGen/CMakeLists.txt

@@ -1,10 +1,3 @@
-add_pure_swift_host_library(swiftLLVMJSON STATIC EMIT_MODULE
-  Sources/LLVMJSON/LLVMJSON.swift
-
-  DEPENDENCIES
-    swiftBasic
-)
-
 set(ASTGen_Swift_dependencies)
 
 # If requested, build the regular expression parser into the compiler itself.
@@ -61,7 +54,6 @@ add_pure_swift_host_library(swiftASTGen STATIC
     SwiftSyntaxBuilder
     SwiftSyntaxMacros
     SwiftSyntaxMacroExpansion
-    swiftLLVMJSON
     ${ASTGen_Swift_dependencies}
 )
 
@@ -116,7 +108,7 @@ else()
 endif()
 
 if(SWIFT_BUILD_SWIFT_SYNTAX)
-  foreach(target swiftASTGen swiftLLVMJSON swiftIDEUtilsBridging)
+  foreach(target swiftASTGen swiftIDEUtilsBridging)
     target_compile_options(${target} PRIVATE ${compile_options})
   endforeach()
 endif()

lib/ASTGen/Package.swift

@@ -44,7 +44,6 @@ let package = Package(
   ],
   products: [
     .library(name: "swiftASTGen", targets: ["swiftASTGen"]),
-    .library(name: "swiftLLVMJSON", targets: ["swiftLLVMJSON"]),
   ],
   dependencies: [
     .package(path: "../../../swift-syntax")
@@ -63,7 +62,6 @@ let package = Package(
         .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
         .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
         .product(name: "SwiftSyntaxMacroExpansion", package: "swift-syntax"),
-        "swiftLLVMJSON",
         "_CompilerRegexParser",
       ],
       path: "Sources/ASTGen",
@@ -79,12 +77,6 @@ let package = Package(
       path: "Sources/SwiftIDEUtilsBridging",
       swiftSettings: swiftSetttings
     ),
-    .target(
-      name: "swiftLLVMJSON",
-      dependencies: [],
-      path: "Sources/LLVMJSON",
-      swiftSettings: swiftSetttings
-    ),
     .target(
       name: "_CompilerRegexParser",
       dependencies: [],

lib/ASTGen/Sources/ASTGen/PluginHost.swift

@@ -14,7 +14,6 @@ import ASTBridging
 import BasicBridging
 @_spi(PluginMessage) import SwiftCompilerPluginMessageHandling
 import SwiftSyntax
-import swiftLLVMJSON
 
 enum PluginError: String, Error, CustomStringConvertible {
   case stalePlugin = "plugin is stale"
@@ -117,7 +116,7 @@ struct CompilerPlugin {
   }
 
   private func sendMessage(_ message: HostToPluginMessage) throws {
-    let hadError = try LLVMJSON.encoding(message) { (data) -> Bool in
+    let hadError = try JSON.encode(message).withUnsafeBufferPointer { (data) -> Bool in
       return Plugin_sendMessage(opaqueHandle, BridgedData(baseAddress: data.baseAddress, count: data.count))
     }
     if hadError {
@@ -133,7 +132,9 @@ struct CompilerPlugin {
       throw PluginError.failedToReceiveMessage
     }
     let data = UnsafeBufferPointer(start: result.baseAddress, count: result.count)
-    return try LLVMJSON.decode(PluginToHostMessage.self, from: data)
+    return try data.withMemoryRebound(to: UInt8.self) { buffer in
+      try JSON.decode(PluginToHostMessage.self, from: buffer)
+    }
   }
 
   func sendMessageAndWaitWithoutLock(_ message: HostToPluginMessage) throws -> PluginToHostMessage {