---

yaml
---
r: 314271
b: refs/heads/rxwei-patch-6
c: 05903b5
h: refs/heads/master
i:
  314269: bcd937d
  314267: 8f1d373
  314263: 98ca29f
  314255: a7671dd
  314239: 20049fc

Author: jrose-apple

[refs]

@@ -1422,7 +1422,7 @@ refs/heads/remove-AlignedCharArray: a09ee8660ce66898d5a5a04e2adb4a5ecf1c4644
 refs/heads/revert-25193-gsoc-2019-parser: c66a8be4eb8cea9e606bcbfce52820ad02f23413
 refs/heads/revert-25911-revert-25766-reenable-test-tsan-norace-deinit: 0f330b25b83d3c83ce993f535d4a83bb626aafa3
 refs/heads/revert-26183-rename-adjoint-to-pullback: b16bd9f4bc54ae8ec31f412ac542dcf6f522d9ee
-refs/heads/rxwei-patch-6: 27650113538da5a07d80b665036b79569eec862c
+refs/heads/rxwei-patch-6: 05903b593cf9a03e089c0acf10869908cb805950
 refs/heads/shahmishal-patch-3: f3e0bc73927d564bb35354dc6473a1981f2a864e
 refs/heads/shahmishal/pr-swiftsyntax-test: 64ff140a6dfa78ecea27eeb6d29582650198f3e0
 refs/heads/test-libdispatch-preset-on-swift-5.1-branch: 2ab0acdec00ee31d21490154081c3001648a8b85

branches/rxwei-patch-6/lib/Driver/DarwinToolChains.cpp

@@ -245,6 +245,116 @@ static void findARCLiteLibPath(const toolchains::Darwin &TC,
   }
 }
 
+void
+toolchains::Darwin::addArgsToLinkStdlib(ArgStringList &Arguments,
+                                        const DynamicLinkJobAction &job,
+                                        const JobContext &context) const {
+
+  // Link compatibility libraries, if we're deploying back to OSes that
+  // have an older Swift runtime.
+  SmallString<128> SharedResourceDirPath;
+  getResourceDirPath(SharedResourceDirPath, context.Args, /*Shared=*/true);
+  Optional<llvm::VersionTuple> runtimeCompatibilityVersion;
+  
+  if (context.Args.hasArg(options::OPT_runtime_compatibility_version)) {
+    auto value = context.Args.getLastArgValue(
+                                    options::OPT_runtime_compatibility_version);
+    if (value.equals("5.0")) {
+      runtimeCompatibilityVersion = llvm::VersionTuple(5, 0);
+    } else if (value.equals("none")) {
+      runtimeCompatibilityVersion = None;
+    } else {
+      // TODO: diagnose unknown runtime compatibility version?
+    }
+  } else if (job.getKind() == LinkKind::Executable) {
+    runtimeCompatibilityVersion
+                   = getSwiftRuntimeCompatibilityVersionForTarget(getTriple());
+  }
+  
+  if (runtimeCompatibilityVersion) {
+    if (*runtimeCompatibilityVersion <= llvm::VersionTuple(5, 0)) {
+      // Swift 5.0 compatibility library
+      SmallString<128> BackDeployLib;
+      BackDeployLib.append(SharedResourceDirPath);
+      llvm::sys::path::append(BackDeployLib, "libswiftCompatibility50.a");
+      
+      if (llvm::sys::fs::exists(BackDeployLib)) {
+        Arguments.push_back("-force_load");
+        Arguments.push_back(context.Args.MakeArgString(BackDeployLib));
+      }
+    }
+  }
+    
+  if (job.getKind() == LinkKind::Executable) {
+    if (runtimeCompatibilityVersion)
+      if (*runtimeCompatibilityVersion <= llvm::VersionTuple(5, 0)) {
+        // Swift 5.0 dynamic replacement compatibility library.
+        SmallString<128> BackDeployLib;
+        BackDeployLib.append(SharedResourceDirPath);
+        llvm::sys::path::append(BackDeployLib,
+                                "libswiftCompatibilityDynamicReplacements.a");
+
+        if (llvm::sys::fs::exists(BackDeployLib)) {
+          Arguments.push_back("-force_load");
+          Arguments.push_back(context.Args.MakeArgString(BackDeployLib));
+        }
+      }
+  }
+
+  // Add the runtime library link path, which is platform-specific and found
+  // relative to the compiler.
+  SmallVector<std::string, 4> RuntimeLibPaths;
+  getRuntimeLibraryPaths(RuntimeLibPaths, context.Args,
+                         context.OI.SDKPath, /*Shared=*/true);
+
+  for (auto path : RuntimeLibPaths) {
+    Arguments.push_back("-L");
+    Arguments.push_back(context.Args.MakeArgString(path));
+  }
+
+  if (context.Args.hasArg(options::OPT_toolchain_stdlib_rpath)) {
+    // If the user has explicitly asked for a toolchain stdlib, we should
+    // provide one using -rpath. This used to be the default behaviour but it
+    // was considered annoying in at least the SwiftPM scenario (see
+    // https://bugs.swift.org/browse/SR-1967) and is obsolete in all scenarios
+    // of deploying for Swift-in-the-OS. We keep it here as an optional
+    // behaviour so that people downloading snapshot toolchains for testing new
+    // stdlibs will be able to link to the stdlib bundled in that toolchain.
+    for (auto path : RuntimeLibPaths) {
+      Arguments.push_back("-rpath");
+      Arguments.push_back(context.Args.MakeArgString(path));
+    }
+  } else if (tripleHasSwiftInTheOS(getTriple()) ||
+             context.Args.hasArg(options::OPT_no_stdlib_rpath)) {
+    // If targeting an OS with Swift in /usr/lib/swift, the LC_ID_DYLIB
+    // install_name the stdlib will be an absolute path like
+    // /usr/lib/swift/libswiftCore.dylib, and we do not need to provide an rpath
+    // at all.
+    //
+    // Also, if the user explicitly asks for no rpath entry, we assume they know
+    // what they're doing and do not add one here.
+  } else {
+    // The remaining cases are back-deploying (to OSs predating
+    // Swift-in-the-OS). In these cases, the stdlib will be giving us (via
+    // stdlib/linker-support/magic-symbols-for-install-name.c) an LC_ID_DYLIB
+    // install_name that is rpath-relative, like @rpath/libswiftCore.dylib.
+    //
+    // If we're linking an app bundle, it's possible there's an embedded stdlib
+    // in there, in which case we'd want to put @executable_path/../Frameworks
+    // in the rpath to find and prefer it, but (a) we don't know when we're
+    // linking an app bundle and (b) we probably _never_ will be because Xcode
+    // links using clang, not the swift driver.
+    //
+    // So that leaves us with the case of linking a command-line app. These are
+    // only supported by installing a secondary package that puts some frozen
+    // Swift-in-OS libraries in the /usr/lib/swift location. That's the best we
+    // can give for rpath, though it might fail at runtime if the support
+    // package isn't installed.
+    Arguments.push_back("-rpath");
+    Arguments.push_back(context.Args.MakeArgString("/usr/lib/swift"));
+  }
+}
+
 ToolChain::InvocationInfo
 toolchains::Darwin::constructInvocation(const DynamicLinkJobAction &job,
                                         const JobContext &context) const {
@@ -396,109 +506,7 @@ toolchains::Darwin::constructInvocation(const DynamicLinkJobAction &job,
   Arguments.push_back("-arch");
   Arguments.push_back(context.Args.MakeArgString(getTriple().getArchName()));
 
-  // Link compatibility libraries, if we're deploying back to OSes that
-  // have an older Swift runtime.
-  SmallString<128> SharedResourceDirPath;
-  getResourceDirPath(SharedResourceDirPath, context.Args, /*Shared=*/true);
-  Optional<llvm::VersionTuple> runtimeCompatibilityVersion;
-  
-  if (context.Args.hasArg(options::OPT_runtime_compatibility_version)) {
-    auto value = context.Args.getLastArgValue(
-                                    options::OPT_runtime_compatibility_version);
-    if (value.equals("5.0")) {
-      runtimeCompatibilityVersion = llvm::VersionTuple(5, 0);
-    } else if (value.equals("none")) {
-      runtimeCompatibilityVersion = None;
-    } else {
-      // TODO: diagnose unknown runtime compatibility version?
-    }
-  } else if (job.getKind() == LinkKind::Executable) {
-    runtimeCompatibilityVersion
-                         = getSwiftRuntimeCompatibilityVersionForTarget(Triple);
-  }
-  
-  if (runtimeCompatibilityVersion) {
-    if (*runtimeCompatibilityVersion <= llvm::VersionTuple(5, 0)) {
-      // Swift 5.0 compatibility library
-      SmallString<128> BackDeployLib;
-      BackDeployLib.append(SharedResourceDirPath);
-      llvm::sys::path::append(BackDeployLib, "libswiftCompatibility50.a");
-      
-      if (llvm::sys::fs::exists(BackDeployLib)) {
-        Arguments.push_back("-force_load");
-        Arguments.push_back(context.Args.MakeArgString(BackDeployLib));
-      }
-    }
-  }
-    
-  if (job.getKind() == LinkKind::Executable) {
-    if (runtimeCompatibilityVersion)
-      if (*runtimeCompatibilityVersion <= llvm::VersionTuple(5, 0)) {
-        // Swift 5.0 dynamic replacement compatibility library.
-        SmallString<128> BackDeployLib;
-        BackDeployLib.append(SharedResourceDirPath);
-        llvm::sys::path::append(BackDeployLib,
-                                "libswiftCompatibilityDynamicReplacements.a");
-
-        if (llvm::sys::fs::exists(BackDeployLib)) {
-          Arguments.push_back("-force_load");
-          Arguments.push_back(context.Args.MakeArgString(BackDeployLib));
-        }
-      }
-  }
-
-  SmallVector<std::string, 4> RuntimeLibPaths;
-  getRuntimeLibraryPaths(RuntimeLibPaths, context.Args,
-                         context.OI.SDKPath, /*Shared=*/true);
-
-  // Add the runtime library link path, which is platform-specific and found
-  // relative to the compiler.
-  for (auto path : RuntimeLibPaths) {
-    Arguments.push_back("-L");
-    Arguments.push_back(context.Args.MakeArgString(path));
-  }
-
-  if (context.Args.hasArg(options::OPT_toolchain_stdlib_rpath)) {
-    // If the user has explicitly asked for a toolchain stdlib, we should
-    // provide one using -rpath. This used to be the default behaviour but it
-    // was considered annoying in at least the SwiftPM scenario (see
-    // https://bugs.swift.org/browse/SR-1967) and is obsolete in all scenarios
-    // of deploying for Swift-in-the-OS. We keep it here as an optional
-    // behaviour so that people downloading snapshot toolchains for testing new
-    // stdlibs will be able to link to the stdlib bundled in that toolchain.
-    for (auto path : RuntimeLibPaths) {
-      Arguments.push_back("-rpath");
-      Arguments.push_back(context.Args.MakeArgString(path));
-    }
-  } else if (tripleHasSwiftInTheOS(Triple) ||
-             context.Args.hasArg(options::OPT_no_stdlib_rpath)) {
-    // If targeting an OS with Swift in /usr/lib/swift, the LC_ID_DYLIB
-    // install_name the stdlib will be an absolute path like
-    // /usr/lib/swift/libswiftCore.dylib, and we do not need to provide an rpath
-    // at all.
-    //
-    // Also, if the user explicitly asks for no rpath entry, we assume they know
-    // what they're doing and do not add one here.
-  } else {
-    // The remaining cases are back-deploying (to OSs predating
-    // Swift-in-the-OS). In these cases, the stdlib will be giving us (via
-    // stdlib/linker-support/magic-symbols-for-install-name.c) an LC_ID_DYLIB
-    // install_name that is rpath-relative, like @rpath/libswiftCore.dylib.
-    //
-    // If we're linking an app bundle, it's possible there's an embedded stdlib
-    // in there, in which case we'd want to put @executable_path/../Frameworks
-    // in the rpath to find and prefer it, but (a) we don't know when we're
-    // linking an app bundle and (b) we probably _never_ will be because Xcode
-    // links using clang, not the swift driver.
-    //
-    // So that leaves us with the case of linking a command-line app. These are
-    // only supported by installing a secondary package that puts some frozen
-    // Swift-in-OS libraries in the /usr/lib/swift location. That's the best we
-    // can give for rpath, though it might fail at runtime if the support
-    // package isn't installed.
-    Arguments.push_back("-rpath");
-    Arguments.push_back(context.Args.MakeArgString("/usr/lib/swift"));
-  }
+  addArgsToLinkStdlib(Arguments, job, context);
 
   if (context.Args.hasArg(options::OPT_profile_generate)) {
     SmallString<128> LibProfile;

branches/rxwei-patch-6/lib/Driver/ToolChains.h

@@ -26,6 +26,11 @@ namespace toolchains {
 
 class LLVM_LIBRARY_VISIBILITY Darwin : public ToolChain {
 protected:
+
+  void addArgsToLinkStdlib(llvm::opt::ArgStringList &Arguments,
+                           const DynamicLinkJobAction &job,
+                           const JobContext &context) const;
+
   InvocationInfo constructInvocation(const InterpretJobAction &job,
                                      const JobContext &context) const override;
   InvocationInfo constructInvocation(const DynamicLinkJobAction &job,