wip

rintaro · rintaro · commit 6b5e554907cc · 2024-05-20T19:00:00.000-07:00
diff --git a/include/swift/AST/ASTContext.h b/include/swift/AST/ASTContext.h
@@ -74,7 +74,6 @@ namespace swift {
   class ClangModuleLoader;
   class ClangNode;
   class ClangTypeConverter;
-  class CompilerPlugin;
   class ConcreteDeclRef;
   class ConstructorDecl;
   class Decl;
diff --git a/include/swift/AST/PluginRegistry.h b/include/swift/AST/PluginRegistry.h
@@ -65,8 +65,8 @@ class CompilerPlugin {
 
   virtual ~CompilerPlugin();
 
-  // Launch the plugin if it's not already running, or it's stale. Return an
-  // error if it's fails to execute it.
+  /// Launch the plugin if it's not already running, or it's stale. Return an
+  /// error if it's fails to execute it.
   virtual llvm::Error spawnIfNeeded() = 0;
 
   /// Send a message to the plugin.
@@ -83,13 +83,16 @@ class InProcessPlugins : public CompilerPlugin {
   /// PluginServer
   llvm::sys::DynamicLibrary server;
 
+  /// Entry point in the in-process plugin server. It received the request
+  /// string and populate the response string. deallocating the populated
+  ///  `repsonseDataPtr` is caller's responsibility.
   using HandleMessageFunction = bool (*)(const char *requestData,
                                          size_t requestLength,
                                          const char **repsonseDataPtr,
                                          size_t *responseDataLengthPtr);
   HandleMessageFunction handleMessageFn;
 
-  /// Temporary strorage to store the response data from 'handleMessageFn'.
+  /// Temporary storage for the response data from 'handleMessageFn'.
   std::string receivedResponse;
 
   InProcessPlugins(llvm::StringRef serverPath, llvm::sys::DynamicLibrary server,
@@ -98,10 +101,10 @@ class InProcessPlugins : public CompilerPlugin {
         handleMessageFn(handleMessageFn) {}
 
 public:
+  /// Create and instance by loading the in-process plugin server at
+  /// 'serverPath' and return it.
   static llvm::Expected<InProcessPlugins *> create(const char *serverPath);
 
-  llvm::StringRef getServerPath() const { return getPath(); }
-
   /// Send a message to the plugin.
   llvm::Error sendMessage(llvm::StringRef message) override;
 
@@ -113,7 +116,11 @@ class InProcessPlugins : public CompilerPlugin {
     return llvm::Error::success();
   }
 
-  void addOnReconnect(std::function<void(void)> *fn) override;
+  void addOnReconnect(std::function<void(void)> *fn) override {
+    // In-Process plugins is always connected. So "on reconnect" callbacks are
+    // useless.
+    delete fn;
+  }
 };
 
 /// Represent a "resolved" executable plugin.
@@ -195,6 +202,7 @@ class LoadedExecutablePlugin : public CompilerPlugin {
 };
 
 class PluginRegistry {
+  /// The in-process plugin server.
   std::unique_ptr<InProcessPlugins> inProcessPlugins;
 
   /// Record of loaded plugin executables.
@@ -209,7 +217,10 @@ class PluginRegistry {
 public:
   PluginRegistry();
 
-  /// Get a in-process plugin server.
+  /// Get the in-process plugin server.
+  /// If it's loaded, returned the cached object. If the loaded instance is
+  /// from a different 'serverPath', returns an error as we don't support
+  /// multiple in-process plugin server in a host process.
   llvm::Expected<CompilerPlugin *>
   getInProcessPlugins(llvm::StringRef serverPath);
 
diff --git a/lib/AST/PluginRegistry.cpp b/lib/AST/PluginRegistry.cpp
@@ -91,6 +91,11 @@ llvm::Error InProcessPlugins::sendMessage(llvm::StringRef message) {
 
   // Store the response and wait for 'waitForNextMessage()' call.
   receivedResponse = std::string(responseData, responseLength);
+
+  if (shouldDumpMessaging()) {
+    llvm::dbgs() << "<-(plugin:0) " << receivedResponse << "\n";
+  }
+
   assert(!receivedResponse.empty() && "received empty response()");
   return llvm::Error::success();
 }
@@ -99,19 +104,10 @@ llvm::Expected<std::string> InProcessPlugins::waitForNextMessage() {
   assert(!receivedResponse.empty() &&
          "waitForNextMessage() called without response data.");
   auto message = receivedResponse;
-  if (shouldDumpMessaging()) {
-    llvm::dbgs() << "<-(plugin:0) " << message << "\n";
-  }
   receivedResponse = "";
   return message;
 }
 
-void InProcessPlugins::addOnReconnect(std::function<void()> *fn) {
-  // In-Process plugins is always connected. So "on reconnect" callbacks are
-  // useless.
-  delete fn;
-}
-
 llvm::Expected<CompilerPlugin *>
 PluginRegistry::getInProcessPlugins(llvm::StringRef serverPath) {
   std::lock_guard<std::mutex> lock(mtx);
@@ -127,10 +123,10 @@ PluginRegistry::getInProcessPlugins(llvm::StringRef serverPath) {
           });
     }
     inProcessPlugins = std::unique_ptr<InProcessPlugins>(server.get());
-  } else if (inProcessPlugins->getServerPath() != serverPath) {
+  } else if (inProcessPlugins->getPath() != serverPath) {
     return llvm::createStringError(
         llvm::inconvertibleErrorCode(),
-        "loading multiple in-process servers are not supported: '%s' and '%s'", inProcessPlugins->getServerPath().str().c_str(), serverPath.str().c_str());
+        "loading multiple in-process servers are not supported: '%s' and '%s'", inProcessPlugins->getPath().data(), serverPath.str().c_str());
   }
   inProcessPlugins->setDumpMessaging(dumpMessaging);
 
diff --git a/lib/CompilerSwiftSyntax/CMakeLists.txt b/lib/CompilerSwiftSyntax/CMakeLists.txt
@@ -38,19 +38,9 @@ macro(target_link_libraries_whole_archive target)
     set_property(TARGET ${target} APPEND PROPERTY
       INTERFACE_INCLUDE_DIRECTORIES "$<TARGET_PROPERTY:${lib},INTERFACE_INCLUDE_DIRECTORIES>"
     )
+    force_add_dependencies(${target} ${lib})
       
   endforeach()
-  #  if(WIN32)
-  #  foreach(lib ${ARGN})
-  #    target_link_options(${target} PRIVATE "/WHOLEARCHIVE:${lib}")
-  #  endforeach()
-  #elseif (APPLE)
-  #  target_link_libraries(${target} PRIVATE ${ARGN})
-  #  target_link_options(${target} PRIVATE "SHELL:-Xlinker -all_load")
-  #else ()
-  #  target_link_libraries(${target} PRIVATE ${ARGN})
-  #  target_link_options(${target} PRIVATE "SHELL:-Xlinker --whole-archive")
-  #endif ()
 endmacro()
 
 target_link_libraries_whole_archive(swiftSyntaxUnified 
diff --git a/lib/CompilerSwiftSyntax/dummy.c b/lib/CompilerSwiftSyntax/dummy.c
diff --git a/lib/CompilerSwiftSyntax/dummy.swift b/lib/CompilerSwiftSyntax/dummy.swift
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
@@ -391,12 +391,9 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
     inputArgs.AddAllArgs(arguments, options::OPT_file_compilation_dir);
   }
 
-  inputArgs.AddAllArgs(arguments, options::OPT_plugin_search_Group);
-
-
-
   // Specify default plugin search path options after explicitly specified
   // options.
+  inputArgs.AddAllArgs(arguments, options::OPT_plugin_search_Group);
   addPlatformSpecificPluginFrontendArgs(OI, output, inputArgs, arguments);
 
   addPluginArguments(inputArgs, arguments);
diff --git a/test/Macros/macro_plugin_broken_shlib.swift b/test/Macros/macro_plugin_broken_shlib.swift
@@ -34,8 +34,8 @@
 // RUN: c-index-test -read-diagnostics %t/macro_expand_inproc.dia 2>&1 | %FileCheck -check-prefix INPROC %s
 
 // INPROC-NOT: {{error|warning}}
-// INPROC: test.swift:1:33: warning: external macro implementation type 'TestPlugin.FooMacro' could not be found for macro 'fooMacro'; compiler plugin 'BUILD_DIR/{{.*}}/libTestPlugin.dylib' could not be loaded; dlopen(BUILD_DIR/{{.*}}/libTestPlugin.dylib, 0x0005): tried: 'BUILD_DIR/{{.*}}/libTestPlugin.dylib'
-// INPROC: test.swift:4:7: error: external macro implementation type 'TestPlugin.FooMacro' could not be found for macro 'fooMacro'; compiler plugin 'BUILD_DIR/{{.*}}/libTestPlugin.dylib' could not be loaded; dlopen(BUILD_DIR/{{.*}}/libTestPlugin.dylib, 0x0005): tried: 'BUILD_DIR/{{.*}}/libTestPlugin.dylib'
+// INPROC: test.swift:1:33: warning: external macro implementation type 'TestPlugin.FooMacro' could not be found for macro 'fooMacro'; failed to load library plugin 'BUILD_DIR/{{.*}}/libTestPlugin.dylib' in plugin server 'BUILD_DIR/{{.*}}/libSwiftInProcPluginServer.dylib'; loader error: dlopen(BUILD_DIR/{{.*}}/libTestPlugin.dylib, 0x0005): tried: 'BUILD_DIR/{{.*}}/libTestPlugin.dylib'
+// INPROC: test.swift:4:7: error: external macro implementation type 'TestPlugin.FooMacro' could not be found for macro 'fooMacro'; failed to load library plugin 'BUILD_DIR/{{.*}}/libTestPlugin.dylib' in plugin server 'BUILD_DIR/{{.*}}/libSwiftInProcPluginServer.dylib'; loader error: dlopen(BUILD_DIR/{{.*}}/libTestPlugin.dylib, 0x0005): tried: 'BUILD_DIR/{{.*}}/libTestPlugin.dylib'
 // INPROC: test.swift:1:33: note: 'fooMacro' declared here
 // INPROC-NOT: {{error|warning}}
 
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
@@ -32,7 +32,7 @@ if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")
                           swiftDriverTool
                           swiftCompilerStub)
 
-                      #add_swift_parser_link_libraries(swift-frontend-bootstrapping0)
+  add_swift_parser_link_libraries(swift-frontend-bootstrapping0)
 
   swift_create_post_build_symlink(swift-frontend-bootstrapping0
     SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"
@@ -53,7 +53,7 @@ if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")
                           swiftDriverTool
                           swiftCompilerModules-bootstrapping1)
 
-                      #add_swift_parser_link_libraries(swift-frontend-bootstrapping1)
+  add_swift_parser_link_libraries(swift-frontend-bootstrapping1)
 
   swift_create_post_build_symlink(swift-frontend-bootstrapping1
     SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"
@@ -71,7 +71,7 @@ target_link_libraries(swift-frontend
                         swiftDriverTool
                         swiftCompilerModules)
 
-                    #add_swift_parser_link_libraries(swift-frontend)
+add_swift_parser_link_libraries(swift-frontend)
 
 # Create a `swift-driver` executable adjacent to the `swift-frontend` executable
 # to ensure that `swiftc` forwards to the standalone driver when invoked.
