WIP

Author: rintaro

include/swift/AST/PluginRegistry.h

@@ -48,7 +48,7 @@ class CompilerPlugin {
   bool shouldDumpMessaging() const { return dumpMessaging; }
 
 public:
-  NullTerminatedStringRef getPath() { return {path.c_str(), path.size()}; }
+  NullTerminatedStringRef getPath() const { return {path.c_str(), path.size()}; }
 
   void lock() { mtx.lock(); }
   void unlock() { mtx.unlock(); }
@@ -80,8 +80,6 @@ class CompilerPlugin {
 
 /// Represents a in-process plugin server.
 class InProcessPlugins : public CompilerPlugin {
-  std::string serverPath;
-
   /// PluginServer
   llvm::sys::DynamicLibrary server;
 
@@ -100,9 +98,9 @@ class InProcessPlugins : public CompilerPlugin {
         handleMessageFn(handleMessageFn) {}
 
 public:
-  static std::unique_ptr<InProcessPlugins> create(const char *serverPath);
+  static llvm::Expected<InProcessPlugins *> create(const char *serverPath);
 
-  llvm::StringRef getServerPath() const { return serverPath; }
+  llvm::StringRef getServerPath() const { return getPath(); }
 
   /// Send a message to the plugin.
   llvm::Error sendMessage(llvm::StringRef message) override;

lib/AST/PluginRegistry.cpp

@@ -50,16 +50,22 @@ CompilerPlugin::~CompilerPlugin() {
     this->cleanup();
 }
 
-std::unique_ptr<InProcessPlugins>
+llvm::Expected<InProcessPlugins *>
 InProcessPlugins::create(const char *serverPath) {
-  auto server = llvm::sys::DynamicLibrary::getLibrary(serverPath);
+  std::string err;
+  auto server = llvm::sys::DynamicLibrary::getLibrary(serverPath, &err);
+  if (!server.isValid()) {
+    return llvm::createStringError(llvm::inconvertibleErrorCode(), err);
+  }
+
   auto funcPtr =
       server.getAddressOfSymbol("swift_inproc_plugins_handle_message");
   if (!funcPtr) {
-    return nullptr;
+    return llvm::createStringError(llvm::inconvertibleErrorCode(),
+                                   "entry point not found in '%s'", serverPath);
   }
-  return std::unique_ptr<InProcessPlugins>(new InProcessPlugins(
-      serverPath, server, reinterpret_cast<HandleMessageFunction>(funcPtr)));
+  return new InProcessPlugins(serverPath, server,
+                              reinterpret_cast<HandleMessageFunction>(funcPtr));
 }
 
 llvm::Error InProcessPlugins::sendMessage(llvm::StringRef message) {
@@ -110,16 +116,21 @@ llvm::Expected<CompilerPlugin *>
 PluginRegistry::getInProcessPlugins(llvm::StringRef serverPath) {
   std::lock_guard<std::mutex> lock(mtx);
   if (!inProcessPlugins) {
-    inProcessPlugins = InProcessPlugins::create(serverPath.str().c_str());
-    if (!inProcessPlugins) {
-      return llvm::createStringError(
-          llvm::inconvertibleErrorCode(),
-          "failed to load in-process plugin server: " + serverPath);
+    auto server = InProcessPlugins::create(serverPath.str().c_str());
+    if (!server) {
+      return llvm::handleErrors(
+          server.takeError(), [&](const llvm::ErrorInfoBase &err) {
+            return llvm::createStringError(
+                err.convertToErrorCode(),
+                "failed to load in-process plugin server: " + serverPath +
+                    "; " + err.message());
+          });
     }
+    inProcessPlugins = std::unique_ptr<InProcessPlugins>(server.get());
   } else if (inProcessPlugins->getServerPath() != serverPath) {
     return llvm::createStringError(
         llvm::inconvertibleErrorCode(),
-        "loading multiple in-process servers are not supported");
+        "loading multiple in-process servers are not supported: '%s' and '%s'", inProcessPlugins->getServerPath().str().c_str(), serverPath.str().c_str());
   }
   inProcessPlugins->setDumpMessaging(dumpMessaging);
 

lib/ASTGen/CMakeLists.txt

@@ -36,7 +36,6 @@ add_pure_swift_host_library(swiftASTGen STATIC
   Sources/ASTGen/Regex.swift
   Sources/ASTGen/SourceFile.swift
   Sources/ASTGen/SourceManager.swift
-  Sources/ASTGen/SourceManager+MacroExpansionContext.swift
   Sources/ASTGen/Stmts.swift
   Sources/ASTGen/TypeAttrs.swift
   Sources/ASTGen/Types.swift

lib/ASTGen/Sources/ASTGen/PluginHost.swift

@@ -319,7 +319,7 @@ class PluginDiagnosticsEngine {
     messageSuffix: String? = nil
   ) {
     for diagnostic in diagnostics {
-      self.emit(diagnostic)
+      self.emit(diagnostic, messageSuffix: messageSuffix)
     }
   }
 
@@ -378,6 +378,26 @@ class PluginDiagnosticsEngine {
   }
 }
 
+extension String {
+  /// Retrieve the base name of a string that represents a path, removing the
+  /// directory.
+  var basename: String {
+    guard
+      let lastSlash = lastIndex(where: {
+        #if os(iOS) || os(macOS) || os(tvOS) || os(watchOS) || os(Android) || os(Linux)
+        ["/"].contains($0)
+        #else
+        ["/", "\\"].contains($0)
+        #endif
+      })
+    else {
+      return self
+    }
+
+    return String(self[index(after: lastSlash)...])
+  }
+}
+
 extension PluginMessage.Syntax {
   init?(syntax: Syntax, in sourceFilePtr: UnsafePointer<ExportedSourceFile>) {
     let kind: PluginMessage.Syntax.Kind

lib/ASTGen/Sources/ASTGen/SourceManager+MacroExpansionContext.swift

@@ -17,7 +17,7 @@ function(includeSwiftSyntax)
   # can be used from tools that has its own swift-syntax libraries as SwiftPM dependencies.
   set(SWIFT_MODULE_ABI_NAME_PREFIX "_Compiler")
   set(SWIFTSYNTAX_TARGET_NAMESPACE "_Compiler")
-  set(SWIFT_EMIT_MODULE OFF)
+  set(SWIFTSYNTAX_EMIT_MODULE OFF)
 
   file(TO_CMAKE_PATH "${SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE}" swift_syntax_path)
   FetchContent_Declare(CompilerSwiftSyntax SOURCE_DIR "${swift_syntax_path}")

lib/CompilerSwiftSyntax/CMakeLists.txt

@@ -136,10 +136,16 @@ toolchains::Darwin::addPluginArguments(const ArgList &Args,
   CompilerInvocation::computeRuntimeResourcePathFromExecutablePath(
       programPath, /*shared=*/true, pluginPath);
 
-  auto defaultPluginPath = pluginPath;
-  llvm::sys::path::append(defaultPluginPath, "host", "plugins");
+  // In-process plugin server path.
+  auto inProcPluginServerPath = pluginPath;
+  llvm::sys::path::append(inProcPluginServerPath, "host",
+                          "libSwiftInProcPluginServer.dylib");
+  Arguments.push_back("-in-process-plugin-server-path");
+  Arguments.push_back(Args.MakeArgString(inProcPluginServerPath));
 
   // Default plugin path.
+  auto defaultPluginPath = pluginPath;
+  llvm::sys::path::append(defaultPluginPath, "host", "plugins");
   Arguments.push_back("-plugin-path");
   Arguments.push_back(Args.MakeArgString(defaultPluginPath));
 

lib/Driver/DarwinToolChains.cpp

@@ -57,10 +57,16 @@ toolchains::GenericUnix::addPluginArguments(const ArgList &Args,
   CompilerInvocation::computeRuntimeResourcePathFromExecutablePath(
       programPath, /*shared=*/true, pluginPath);
 
-  auto defaultPluginPath = pluginPath;
-  llvm::sys::path::append(defaultPluginPath, "host", "plugins");
+  // In-process plugin server path.
+  auto inProcPluginServerPath = pluginPath;
+  llvm::sys::path::append(inProcPluginServerPath, "host",
+                          "libSwiftInProcPluginServer.so");
+  Arguments.push_back("-in-process-plugin-server-path");
+  Arguments.push_back(Args.MakeArgString(inProcPluginServerPath));
 
   // Default plugin path.
+  auto defaultPluginPath = pluginPath;
+  llvm::sys::path::append(defaultPluginPath, "host", "plugins");
   Arguments.push_back("-plugin-path");
   Arguments.push_back(Args.MakeArgString(defaultPluginPath));
 

lib/Driver/UnixToolChains.cpp

@@ -49,6 +49,13 @@ toolchains::Windows::addPluginArguments(const ArgList &Args,
   SmallString<261> LibraryPath = StringRef(getDriver().getSwiftProgramPath());
   llvm::sys::path::remove_filename(LibraryPath); // Remove `swift`
 
+  // In-process plugin server path.
+  SmallString<261> InProcPluginServerPath = LibraryPath;
+  llvm::sys::path::append(InProcPluginServerPath,
+                          "SwiftInProcPluginServer.dll");
+  Arguments.push_back("-in-process-plugin-server-path");
+  Arguments.push_back(Args.MakeArgString(InProcPluginServerPath));
+
   // Default plugin path.
   Arguments.push_back("-plugin-path");
   Arguments.push_back(Args.MakeArgString(LibraryPath));