Merge pull request #64528 from DougGregor/old-driver-plugin-path

[Driver] Implement inference of `-plugin-path` arguments.

Author: DougGregor

lib/Driver/ToolChains.cpp

@@ -376,6 +376,32 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
     inputArgs.AddAllArgs(arguments, options::OPT_file_compilation_dir);
   }
 
+  // Add plugin path options.
+  inputArgs.AddAllArgs(arguments, options::OPT_plugin_path);
+
+  {
+    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));
+  }
+
   // Pass through any subsystem flags.
   inputArgs.AddAllArgs(arguments, options::OPT_Xllvm);
   inputArgs.AddAllArgs(arguments, options::OPT_Xcc);

test/Driver/compiler_plugin_path.swift

@@ -0,0 +1,7 @@
+// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s 2>^1 | %FileCheck %s
+
+// CHECK: -plugin-path
+// CHECK-SAME: {{(/|\\\\)}}lib{{(/|\\\\)}}swift{{(/|\\\\)}}host{{(/|\\\\)}}plugins
+
+// CHECK-SAME: -plugin-path
+// CHECK-SAME: {{(/|\\\\)}}local{{(/|\\\\)}}lib{{(/|\\\\)}}swift{{(/|\\\\)}}host{{(/|\\\\)}}plugins