[Target Info] Compute resource-directory relative to the SDK on non-Darwin targets

Since the new driver uses `-print-target-info` for the resource directory and the legacy C++ driver used the logic in `getResourceDirPath()`, mimic that logic now in the print-target-info job itself.

Author: artemcm

Diff for: include/swift/Frontend/Frontend.h

@@ -254,6 +254,10 @@ class CompilerInvocation {
       StringRef mainExecutablePath, bool shared,
       llvm::SmallVectorImpl<char> &runtimeResourcePath);
 
+  /// Computes the runtime resource path relative to the given Swift
+  /// executable.
+  void computeRuntimeResourcePathForTargetInfo();
+
   /// Appends `lib/swift[_static]` to the given path
   static void appendSwiftLibDir(llvm::SmallVectorImpl<char> &path, bool shared);
 

Diff for: lib/Frontend/CompilerInvocation.cpp

@@ -60,6 +60,28 @@ getVersionTuple(const llvm::Triple &triple) {
   return triple.getOSVersion();
 }
 
+void CompilerInvocation::computeRuntimeResourcePathForTargetInfo() {
+  const auto &frontendOpts = getFrontendOptions();
+  const auto &searchPathOpts = getSearchPathOptions();
+  const auto &langOpts = getLangOptions();
+  SmallString<128> resourceDirPath;
+  if (!searchPathOpts.RuntimeResourcePath.empty()) {
+    resourceDirPath =  searchPathOpts.RuntimeResourcePath;
+  } else if (!langOpts.Target.isOSDarwin() &&
+             !searchPathOpts.getSDKPath().empty()) {
+    StringRef value = searchPathOpts.getSDKPath();
+    resourceDirPath.append(value.begin(), value.end());
+    llvm::sys::path::append(resourceDirPath, "usr");
+    CompilerInvocation::appendSwiftLibDir(resourceDirPath,
+                                          frontendOpts.UseSharedResourceFolder);
+  } else {
+    CompilerInvocation::computeRuntimeResourcePathFromExecutablePath(frontendOpts.MainExecutablePath,
+                                                                     frontendOpts.UseSharedResourceFolder,
+                                                                     resourceDirPath);
+  }
+  setRuntimeResourcePath(resourceDirPath.str().str());
+}
+
 void CompilerInvocation::computeRuntimeResourcePathFromExecutablePath(
     StringRef mainExecutablePath, bool shared,
     llvm::SmallVectorImpl<char> &runtimeResourcePath) {
@@ -81,7 +103,9 @@ void CompilerInvocation::setMainExecutablePath(StringRef Path) {
   llvm::SmallString<128> LibPath;
   computeRuntimeResourcePathFromExecutablePath(
       Path, FrontendOpts.UseSharedResourceFolder, LibPath);
-  setRuntimeResourcePath(LibPath.str());
+  // Target info query computes the resource path wholesale
+  if (!FrontendOpts.PrintTargetInfo)
+    setRuntimeResourcePath(LibPath.str());
 
   llvm::SmallString<128> clangPath(Path);
   llvm::sys::path::remove_filename(clangPath);
@@ -3359,6 +3383,9 @@ bool CompilerInvocation::parseArgs(
     return true;
   }
 
+  if (FrontendOpts.PrintTargetInfo)
+    computeRuntimeResourcePathForTargetInfo();
+
   updateRuntimeLibraryPaths(SearchPathOpts, FrontendOpts, LangOpts);
   setDefaultPrebuiltCacheIfNecessary();
   setDefaultBlocklistsIfNecessary();