Merge pull request #78014 from swiftlang/egorzhdan/libcxx-overlay-linux

[cxx-interop] Support CxxStdlib overlay for libc++ on Linux

Author: egorzhdan

lib/AST/ModuleLoader.cpp

@@ -172,12 +172,6 @@ void ModuleLoader::findOverlayFiles(SourceLoc diagLoc, ModuleDecl *module,
   using namespace llvm::sys;
   using namespace file_types;
 
-  // If an overlay for CxxStdlib was requested, only proceed if compiling with
-  // the platform-default C++ stdlib.
-  if (module->getName() == module->getASTContext().Id_CxxStdlib &&
-      !module->getASTContext().LangOpts.isUsingPlatformDefaultCXXStdlib())
-    return;
-
   // If cross import information is passed on command-line, prefer use that.
   auto &crossImports = module->getASTContext().SearchPathOpts.CrossImportInfo;
   auto overlays = crossImports.find(module->getNameStr());

lib/ClangImporter/ClangImporter.cpp

@@ -4365,10 +4365,8 @@ ModuleDecl *ClangModuleUnit::getOverlayModule() const {
     }
     // If this Clang module is a part of the C++ stdlib, and we haven't loaded
     // the overlay for it so far, it is a split libc++ module (e.g. std_vector).
-    // Load the CxxStdlib overlay explicitly, if building with the
-    // platform-default C++ stdlib.
-    if (!overlay && importer::isCxxStdModule(clangModule) &&
-        Ctx.LangOpts.isUsingPlatformDefaultCXXStdlib()) {
+    // Load the CxxStdlib overlay explicitly.
+    if (!overlay && importer::isCxxStdModule(clangModule)) {
       ImportPath::Module::Builder builder(Ctx.Id_CxxStdlib);
       overlay = owner.loadModule(SourceLoc(), std::move(builder).get());
     }

lib/Frontend/CompilerInvocation.cpp

@@ -384,6 +384,15 @@ void CompilerInvocation::computeCXXStdlibOptions() {
     LangOpts.CXXStdlib = toCXXStdlibKind(cxxStdlibKind);
     LangOpts.PlatformDefaultCXXStdlib = toCXXStdlibKind(cxxDefaultStdlibKind);
   }
+
+  if (!LangOpts.isUsingPlatformDefaultCXXStdlib()) {
+    // The CxxStdlib overlay was built for the platform default C++ stdlib, and
+    // its .swiftmodule file refers to implementation-specific symbols (such as
+    // namespace __1 in libc++, or namespace __cxx11 in libstdc++). Let's
+    // proactively rebuild the CxxStdlib module from its .swiftinterface if a
+    // non-default C++ stdlib is used.
+    FrontendOpts.PreferInterfaceForModules.push_back("CxxStdlib");
+  }
 }
 
 void CompilerInvocation::setRuntimeResourcePath(StringRef Path) {

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -2032,6 +2032,15 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
 
     GenericArgs.push_back(
         ArgSaver.save("-cxx-interoperability-mode=" + compatVersion));
+
+    if (!langOpts.isUsingPlatformDefaultCXXStdlib() &&
+        langOpts.CXXStdlib == CXXStdlibKind::Libcxx) {
+      genericSubInvocation.getLangOptions().CXXStdlib = CXXStdlibKind::Libcxx;
+      genericSubInvocation.getClangImporterOptions().ExtraArgs.push_back(
+          "-stdlib=libc++");
+      GenericArgs.push_back("-Xcc");
+      GenericArgs.push_back("-stdlib=libc++");
+    }
   }
 }
 

test/Interop/Cxx/stdlib/use-std-chrono-libcxx.swift

@@ -0,0 +1,10 @@
+// This test runs another test, use-std-chrono.swift, with libc++ explicitly specified as the C++ stdlib.
+
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift %S/use-std-chrono.swift -I %S/Inputs -o %t/exe -cxx-interoperability-mode=upcoming-swift -Xcc -stdlib=libc++
+// RUN: %target-codesign %t/exe
+// RUN: %target-run %t/exe
+
+// REQUIRES: executable_test
+// REQUIRES: OS=linux-gnu
+// REQUIRES: system_wide_libcxx

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

@@ -0,0 +1,10 @@
+// This test runs another test, use-std-string-view.swift, with libc++ explicitly specified as the C++ stdlib.
+
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift %S/use-std-string-view.swift -I %S/Inputs -o %t/exe -cxx-interoperability-mode=upcoming-swift -Xcc -stdlib=libc++
+// RUN: %target-codesign %t/exe
+// RUN: %target-run %t/exe
+
+// REQUIRES: executable_test
+// REQUIRES: OS=linux-gnu
+// REQUIRES: system_wide_libcxx