Driver: virtualise the plugin path handling

include/swift/Driver/ToolChain.h

@@ -340,7 +340,10 @@ class ToolChain {
   void addLinkRuntimeLib(const llvm::opt::ArgList &Args,
                          llvm::opt::ArgStringList &Arguments,
                          StringRef LibName) const;
-
+
+  virtual void addPluginArguments(const llvm::opt::ArgList &Args,
+                                  llvm::opt::ArgStringList &Arguments) const {}
+
   /// Validates arguments passed to the toolchain.
   ///
   /// An override point for platform-specific subclasses to customize the

lib/Driver/DarwinToolChains.cpp

@@ -24,6 +24,7 @@
 #include "swift/Driver/Compilation.h"
 #include "swift/Driver/Driver.h"
 #include "swift/Driver/Job.h"
+#include "swift/IDETool/CompilerInvocation.h"
 #include "swift/Option/Options.h"
 #include "clang/Basic/DarwinSDKInfo.h"
 #include "clang/Basic/Version.h"
@@ -123,6 +124,31 @@ std::string toolchains::Darwin::sanitizerRuntimeLibName(StringRef Sanitizer,
       .str();
 }
 
+void
+toolchains::Darwin::addPluginArguments(const ArgList &Args,
+                                       ArgStringList &Arguments) const {
+  SmallString<64> pluginPath;
+  auto programPath = getDriver().getSwiftProgramPath();
+  CompilerInvocation::computeRuntimeResourcePathFromExecutablePath(
+      programPath, /*shared=*/true, pluginPath);
+
+  auto defaultPluginPath = pluginPath;
+  llvm::sys::path::append(defaultPluginPath, "host", "plugins");
+
+  // Default plugin path.
+  Arguments.push_back("-plugin-path");
+  Arguments.push_back(Args.MakeArgString(defaultPluginPath));
+
+  // Local plugin path.
+  llvm::sys::path::remove_filename(pluginPath); // Remove "swift"
+  llvm::sys::path::remove_filename(pluginPath); // Remove "lib"
+  llvm::sys::path::append(pluginPath, "local", "lib");
+  llvm::sys::path::append(pluginPath, "swift");
+  llvm::sys::path::append(pluginPath, "host", "plugins");
+  Arguments.push_back("-plugin-path");
+  Arguments.push_back(Args.MakeArgString(pluginPath));
+}
+
 static void addLinkRuntimeLibRPath(const ArgList &Args,
                                    ArgStringList &Arguments,
                                    StringRef DarwinLibName,

lib/Driver/ToolChains.cpp

@@ -372,30 +372,8 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
   // options.
   inputArgs.AddAllArgs(arguments, options::OPT_plugin_search_Group);
   addPlatformSpecificPluginFrontendArgs(OI, output, inputArgs, arguments);
-
-  // Toolchain-relative plugin paths
-  {
-    SmallString<64> pluginPath;
-    auto programPath = getDriver().getSwiftProgramPath();
-    CompilerInvocation::computeRuntimeResourcePathFromExecutablePath(
-        programPath, /*shared=*/true, pluginPath);
 
-    auto defaultPluginPath = pluginPath;
-    llvm::sys::path::append(defaultPluginPath, "host", "plugins");
-
-    // Default plugin path.
-    arguments.push_back("-plugin-path");
-    arguments.push_back(inputArgs.MakeArgString(defaultPluginPath));
-
-    // Local plugin path.
-    llvm::sys::path::remove_filename(pluginPath); // Remove "swift"
-    llvm::sys::path::remove_filename(pluginPath); // Remove "lib"
-    llvm::sys::path::append(pluginPath, "local", "lib");
-    llvm::sys::path::append(pluginPath, "swift");
-    llvm::sys::path::append(pluginPath, "host", "plugins");
-    arguments.push_back("-plugin-path");
-    arguments.push_back(inputArgs.MakeArgString(pluginPath));
-  }
+  addPluginArguments(inputArgs, arguments);
 
   // Pass through any subsystem flags.
   inputArgs.AddAllArgs(arguments, options::OPT_Xllvm);

lib/Driver/ToolChains.h

@@ -65,7 +65,10 @@ class LLVM_LIBRARY_VISIBILITY Darwin : public ToolChain {
                                      const JobContext &context) const override;
   InvocationInfo constructInvocation(const StaticLinkJobAction &job,
                                      const JobContext &context) const override;
-
+
+  void addPluginArguments(const llvm::opt::ArgList &Args,
+                          llvm::opt::ArgStringList &Arguments) const override;
+
   void validateArguments(DiagnosticEngine &diags,
                          const llvm::opt::ArgList &args,
                          StringRef defaultTarget) const override;
@@ -113,8 +116,12 @@ class LLVM_LIBRARY_VISIBILITY Windows : public ToolChain {
 public:
   Windows(const Driver &D, const llvm::Triple &Triple) : ToolChain(D, Triple) {}
   ~Windows() = default;
+
   std::string sanitizerRuntimeLibName(StringRef Sanitizer,
                                       bool shared = true) const override;
+
+  void addPluginArguments(const llvm::opt::ArgList &Args,
+                          llvm::opt::ArgStringList &Arguments) const override;
 };
 
 class LLVM_LIBRARY_VISIBILITY WebAssembly : public ToolChain {
@@ -168,6 +175,9 @@ class LLVM_LIBRARY_VISIBILITY GenericUnix : public ToolChain {
   ~GenericUnix() = default;
   std::string sanitizerRuntimeLibName(StringRef Sanitizer,
                                       bool shared = true) const override;
+
+  void addPluginArguments(const llvm::opt::ArgList &Args,
+                          llvm::opt::ArgStringList &Arguments) const override;
 };
 
 class LLVM_LIBRARY_VISIBILITY Android : public GenericUnix {

lib/Driver/UnixToolChains.cpp

@@ -21,6 +21,7 @@
 #include "swift/Driver/Compilation.h"
 #include "swift/Driver/Driver.h"
 #include "swift/Driver/Job.h"
+#include "swift/IDETool/CompilerInvocation.h"
 #include "swift/Option/Options.h"
 #include "swift/Option/SanitizerOptions.h"
 #include "clang/Basic/Version.h"
@@ -47,6 +48,31 @@ toolchains::GenericUnix::sanitizerRuntimeLibName(StringRef Sanitizer,
       .str();
 }
 
+void
+toolchains::GenericUnix::addPluginArguments(const ArgList &Args,
+                                            ArgStringList &Arguments) const {
+  SmallString<64> pluginPath;
+  auto programPath = getDriver().getSwiftProgramPath();
+  CompilerInvocation::computeRuntimeResourcePathFromExecutablePath(
+      programPath, /*shared=*/true, pluginPath);
+
+  auto defaultPluginPath = pluginPath;
+  llvm::sys::path::append(defaultPluginPath, "host", "plugins");
+
+  // Default plugin path.
+  Arguments.push_back("-plugin-path");
+  Arguments.push_back(Args.MakeArgString(defaultPluginPath));
+
+  // Local plugin path.
+  llvm::sys::path::remove_filename(pluginPath); // Remove "swift"
+  llvm::sys::path::remove_filename(pluginPath); // Remove "lib"
+  llvm::sys::path::append(pluginPath, "local", "lib");
+  llvm::sys::path::append(pluginPath, "swift");
+  llvm::sys::path::append(pluginPath, "host", "plugins");
+  Arguments.push_back("-plugin-path");
+  Arguments.push_back(Args.MakeArgString(pluginPath));
+}
+
 ToolChain::InvocationInfo
 toolchains::GenericUnix::constructInvocation(const InterpretJobAction &job,
                                              const JobContext &context) const {

lib/Driver/WindowsToolChains.cpp

@@ -44,6 +44,17 @@ std::string toolchains::Windows::sanitizerRuntimeLibName(StringRef Sanitizer,
       .str();
 }
 
+void
+toolchains::Windows::addPluginArguments(const ArgList &Args,
+                                        ArgStringList &Arguments) const {
+  SmallString<261> LibraryPath = StringRef(getDriver().getSwiftProgramPath());
+  llvm::sys::path::remove_filename(LibraryPath); // Remove `swift`
+
+  // Default plugin path.
+  Arguments.push_back("-plugin-path");
+  Arguments.push_back(Args.MakeArgString(LibraryPath));
+}
+
 ToolChain::InvocationInfo
 toolchains::Windows::constructInvocation(const DynamicLinkJobAction &job,
                                          const JobContext &context) const {

test/Macros/lit.local.cfg

@@ -10,18 +10,21 @@ def get_target_os():
     return run_os
 
 if get_target_os() in ['windows-msvc']:
-  config.substitutions.insert(
-    0,
-    (
-      '%swift-build-cxx-plugin',
-      '%clang -isysroot %host_sdk -I %swift_src_root/include -L %swift-lib-dir -l_swiftMockPlugin'
+    config.substitutions.insert(0, ('%target-abi', 'WIN'))
+    config.substitutions.insert(
+        0,
+        (
+            '%swift-build-cxx-plugin',
+            '%clang -isysroot %host_sdk -I %swift_src_root/include -L %swift-lib-dir -l_swiftMockPlugin'
+        )
     )
-  )
 else:
-  config.substitutions.insert(
-    0,
-    (
-      '%swift-build-cxx-plugin',
-      '%clang -isysroot %host_sdk -I %swift_src_root/include -L %swift-lib-dir -l_swiftMockPlugin -Xlinker -rpath -Xlinker %swift-lib-dir'
+    # FIXME(compnerd) do all the targets we currently support use SysV ABI?
+    config.substitutions.insert(0, ('%target-abi', 'SYSV'))
+    config.substitutions.insert(
+        0,
+        (
+            '%swift-build-cxx-plugin',
+            '%clang -isysroot %host_sdk -I %swift_src_root/include -L %swift-lib-dir -l_swiftMockPlugin -Xlinker -rpath -Xlinker %swift-lib-dir'
+        )
     )
-  )

test/Macros/serialize_plugin_search_paths.swift

@@ -16,5 +16,5 @@
 // CHECK:     -external-plugin-path {{.*}}plugins#{{.*}}swift-plugin-server
 // CHECK:     -load-plugin-library {{.*}}MacroDefinition.{{dylib|so|dll}}
 // CHECK:     -load-plugin-executable {{.*}}mock-plugin#TestPlugin
-// CHECK:     -plugin-path {{.*}}plugins
-// CHECK:     -plugin-path {{.*}}plugins
+// CHECK-SYSV:-plugin-path {{.*}}plugins
+// CHECK-SYSV:-plugin-path {{.*}}plugins