Merge pull request #75889 from rintaro/macros-no-llvm-dylib

[Macros] Don't dlclose InProcessPluginServer shared library

Author: rintaro

include/swift/AST/PluginRegistry.h

@@ -17,7 +17,6 @@
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Chrono.h"
-#include "llvm/Support/DynamicLibrary.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/Program.h"
 
@@ -98,8 +97,8 @@ class CompilerPlugin {
 
 /// Represents a in-process plugin server.
 class InProcessPlugins : public CompilerPlugin {
-  /// PluginServer
-  llvm::sys::DynamicLibrary server;
+  /// PluginServer shared library handle.
+  void *server;
 
   /// Entry point in the in-process plugin server. It receives the request
   /// string and populate the response string. The return value indicates there
@@ -114,7 +113,7 @@ class InProcessPlugins : public CompilerPlugin {
   /// Temporary storage for the response data from 'handleMessageFn'.
   std::string receivedResponse;
 
-  InProcessPlugins(llvm::StringRef serverPath, llvm::sys::DynamicLibrary server,
+  InProcessPlugins(llvm::StringRef serverPath, void *server,
                    HandleMessageFunction handleMessageFn)
       : CompilerPlugin(serverPath), server(server),
         handleMessageFn(handleMessageFn) {}

lib/AST/PluginRegistry.cpp

@@ -28,6 +28,8 @@
 #if defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
+#include "llvm/Support/ConvertUTF.h"
+#include "llvm/Support/Windows/WindowsSupport.h"
 #include <windows.h>
 #else
 #include <dlfcn.h>
@@ -41,6 +43,46 @@
 
 using namespace swift;
 
+namespace {
+void *loadLibrary(const char *path, std::string *err);
+void *getAddressOfSymbol(void *handle, const char *symbol);
+
+#if defined(_WIN32)
+void *loadLibrary(const char *path, std::string *err) {
+  SmallVector<wchar_t, MAX_PATH> pathUnicode;
+  if (std::error_code ec = llvm::sys::windows::UTF8ToUTF16(path, pathUnicode)) {
+    SetLastError(ec.value());
+    llvm::MakeErrMsg(err, std::string(path) + ": Can't convert to UTF-16");
+    return nullptr;
+  }
+
+  HMODULE handle = LoadLibraryW(pathUnicode.data());
+  if (handle == NULL) {
+    llvm::MakeErrMsg(err, std::string(path) + ": Can't open");
+    return nullptr;
+  }
+  return (void *)handle;
+}
+
+void *getAddressOfSymbol(void *handle, const char *symbol) {
+  return (void *)uintptr_t(GetProcAddress((HMODULE)handle, symbol));
+}
+
+#else
+void *loadLibrary(const char *path, std::string *err) {
+  void *handle = ::dlopen(path, RTLD_LAZY | RTLD_LOCAL);
+  if (!handle)
+    *err = ::dlerror();
+  return handle;
+}
+
+void *getAddressOfSymbol(void *handle, const char *symbol) {
+  return ::dlsym(handle, symbol);
+}
+
+#endif
+} // namespace
+
 PluginRegistry::PluginRegistry() {
   dumpMessaging = ::getenv("SWIFT_DUMP_PLUGIN_MESSAGING") != nullptr;
 }
@@ -54,13 +96,13 @@ CompilerPlugin::~CompilerPlugin() {
 llvm::Expected<std::unique_ptr<InProcessPlugins>>
 InProcessPlugins::create(const char *serverPath) {
   std::string err;
-  auto server = llvm::sys::DynamicLibrary::getLibrary(serverPath, &err);
-  if (!server.isValid()) {
+  auto server = loadLibrary(serverPath, &err);
+  if (!server) {
     return llvm::createStringError(llvm::inconvertibleErrorCode(), err);
   }
 
   auto funcPtr =
-      server.getAddressOfSymbol("swift_inproc_plugins_handle_message");
+      getAddressOfSymbol(server, "swift_inproc_plugins_handle_message");
   if (!funcPtr) {
     return llvm::createStringError(llvm::inconvertibleErrorCode(),
                                    "entry point not found in '%s'", serverPath);