Merge pull request #58962 from apple/egorzhdan/libstdcxx-path

[cxx-interop] Extract libstdc++ installation path from Clang

Author: egorzhdan

include/swift/AST/DiagnosticsClangImporter.def

@@ -117,6 +117,10 @@ WARNING(nonmutating_without_mutable_fields,none,
 
 ERROR(module_map_not_found, none, "module map file '%0' not found", (StringRef))
 
+WARNING(libstdcxx_not_found, none,
+        "libstdc++ not found for '$0'; C++ stdlib may be unavailable",
+        (StringRef))
+
 NOTE(macro_not_imported_unsupported_operator, none, "operator not supported in macro arithmetic", ())
 NOTE(macro_not_imported_unsupported_named_operator, none, "operator '%0' not supported in macro arithmetic", (StringRef))
 NOTE(macro_not_imported_invalid_string_literal, none, "invalid string literal", ())

lib/ClangImporter/ClangImporter.cpp

@@ -52,6 +52,7 @@
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Basic/Version.h"
 #include "clang/CodeGen/ObjectFilePCHContainerOperations.h"
+#include "clang/Driver/Driver.h"
 #include "clang/Frontend/FrontendActions.h"
 #include "clang/Frontend/Utils.h"
 #include "clang/Index/IndexingAction.h"
@@ -875,19 +876,27 @@ getClangInvocationFileMapping(ASTContext &ctx) {
   if (!triple.isOSLinux())
     return {};
 
-  SearchPathOptions &searchPathOpts = ctx.SearchPathOpts;
-
-  Path sdkPath(searchPathOpts.getSDKPath());
-  if (sdkPath.empty())
-    sdkPath = "/";
+  auto clangDiags = clang::CompilerInstance::createDiagnostics(
+      new clang::DiagnosticOptions());
+  clang::driver::Driver clangDriver(ctx.ClangImporterOpts.clangPath,
+                                    triple.str(), *clangDiags);
+  auto cxxStdlibDirs =
+      clangDriver.getLibStdCxxIncludePaths(llvm::opt::InputArgList(), triple);
+  if (cxxStdlibDirs.empty()) {
+    ctx.Diags.diagnose(SourceLoc(), diag::libstdcxx_not_found, triple.str());
+    return {};
+  }
+  Path cxxStdlibDir(cxxStdlibDirs.front());
+  // VFS does not allow mapping paths that contain `../` or `./`.
+  llvm::sys::path::remove_dots(cxxStdlibDir, /*remove_dot_dot=*/true);
 
   // Currently only a modulemap for libstdc++ is injected.
   if (!ctx.LangOpts.EnableCXXInterop)
     return {};
 
   Path actualModuleMapPath;
   Path buffer;
-  if (auto path = getLibStdCxxModuleMapPath(searchPathOpts, triple, buffer))
+  if (auto path = getLibStdCxxModuleMapPath(ctx.SearchPathOpts, triple, buffer))
     actualModuleMapPath = path.getValue();
   else
     return {};
@@ -905,48 +914,26 @@ getClangInvocationFileMapping(ASTContext &ctx) {
   llvm::sys::path::remove_filename(actualHeaderPath);
   llvm::sys::path::append(actualHeaderPath, "libstdcxx.h");
 
-  Path cxxStdlibsRoot(sdkPath);
-  llvm::sys::path::append(cxxStdlibsRoot, "usr", "include", "c++");
-  if (!llvm::sys::fs::exists(cxxStdlibsRoot))
+  // Inject a modulemap into VFS for the libstdc++ directory.
+  // Only inject the module map if the module does not already exist at
+  // {sysroot}/usr/include/module.{map,modulemap}.
+  Path injectedModuleMapLegacyPath(cxxStdlibDir);
+  llvm::sys::path::append(injectedModuleMapLegacyPath, "module.map");
+  if (llvm::sys::fs::exists(injectedModuleMapLegacyPath))
     return {};
 
-  // Collect all installed versions of libstdc++. We currently have no way to
-  // know which libstdc++ version will be used for this Clang invocation.
-  // TODO: extract this information from the Clang driver.
-  SmallVector<Path, 1> cxxStdlibDirs;
-  std::error_code errorCode;
-  for (llvm::vfs::directory_iterator
-           iter = ctx.SourceMgr.getFileSystem()->dir_begin(cxxStdlibsRoot,
-                                                           errorCode),
-           endIter;
-       !errorCode && iter != endIter; iter = iter.increment(errorCode)) {
-    cxxStdlibDirs.push_back(Path(iter->path()));
-  }
-
-  SmallVector<std::pair<std::string, std::string>, 16> result;
-  // Inject a modulemap into the VFS for each of the libstdc++ versions.
-  for (const Path &cxxStdlibDir : cxxStdlibDirs) {
-    // Only inject the module map if the module does not already exist at
-    // {sysroot}/usr/include/module.{map,modulemap}.
-    Path injectedModuleMapLegacyPath(cxxStdlibDir);
-    llvm::sys::path::append(injectedModuleMapLegacyPath, "module.map");
-    if (llvm::sys::fs::exists(injectedModuleMapLegacyPath))
-      continue;
-
-    Path injectedModuleMapPath = cxxStdlibDir;
-    llvm::sys::path::append(injectedModuleMapPath, "module.modulemap");
-    if (llvm::sys::fs::exists(injectedModuleMapPath))
-      continue;
+  Path injectedModuleMapPath(cxxStdlibDir);
+  llvm::sys::path::append(injectedModuleMapPath, "module.modulemap");
+  if (llvm::sys::fs::exists(injectedModuleMapPath))
+    return {};
 
-    Path injectedHeaderPath = cxxStdlibDir;
-    llvm::sys::path::append(injectedHeaderPath, "libstdcxx.h");
+  Path injectedHeaderPath(cxxStdlibDir);
+  llvm::sys::path::append(injectedHeaderPath, "libstdcxx.h");
 
-    result.push_back(
-        {std::string(injectedModuleMapPath), std::string(actualModuleMapPath)});
-    result.push_back(
-        {std::string(injectedHeaderPath), std::string(actualHeaderPath)});
-  }
-  return result;
+  return {
+      {std::string(injectedModuleMapPath), std::string(actualModuleMapPath)},
+      {std::string(injectedHeaderPath), std::string(actualHeaderPath)},
+  };
 }
 
 bool ClangImporter::canReadPCH(StringRef PCHFilename) {

test/Interop/Cxx/stdlib/libstdcxx-module-interface.swift

@@ -9,7 +9,6 @@
 
 // This test is specific to libstdc++ and only runs on platforms where libstdc++ is used.
 // REQUIRES: OS=linux-gnu
-// REQUIRES: rdar93341210
 
 // CHECK-STD: enum std {
 // CHECK-STRING:   struct {{__CxxTemplateInstNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE|__CxxTemplateInstSs}} {

test/Interop/Cxx/stdlib/use-std-string.swift

@@ -4,7 +4,6 @@
 //
 // Enable this everywhere once we have a solution for modularizing other C++ stdlibs: rdar://87654514
 // REQUIRES: OS=macosx || OS=linux-gnu
-// REQUIRES: rdar93341210
 
 import StdlibUnittest
 import StdString