averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #75589 from swiftlang/egorzhdan/linux-libcxx-interop

Browse Source 
[cxx-interop] Allow compiling with libc++ on Linux
This commit is contained in:
Egor Zhdan
2024-08-09 13:42:29 +01:00
committed by GitHub
parent a1eed1fab1 059f0f97d1
commit bfe72b4be9
31 changed files with 348 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -955,8 +955,10 @@ LoadedFile *SerializedModuleLoaderBase::loadAST(
M.setABIName(Ctx.getIdentifier(loadedModuleFile->getModuleABIName()));
if (loadedModuleFile->isConcurrencyChecked())
M.setIsConcurrencyChecked();
if (loadedModuleFile->hasCxxInteroperability())
if (loadedModuleFile->hasCxxInteroperability()) {
M.setHasCxxInteroperability();
M.setCXXStdlibKind(loadedModuleFile->getCXXStdlibKind());
}
if (!loadedModuleFile->getModulePackageName().empty()) {
M.setPackageName(Ctx.getIdentifier(loadedModuleFile->getModulePackageName()));
}
@@ -1056,6 +1058,18 @@ LoadedFile *SerializedModuleLoaderBase::loadAST(
M.getName());
Ctx.Diags.diagnose(loc, diag::enable_cxx_interop_docs);
}
// Modules built with libc++ cannot be imported into modules that are built
// with libstdc++, and vice versa. Make an exception for Cxx.swiftmodule since
// it doesn't refer to any C++ stdlib symbols, and for CxxStdlib.swiftmodule
// since we skipped loading the overlay for the module.
if (M.hasCxxInteroperability() && Ctx.LangOpts.EnableCXXInterop &&
M.getCXXStdlibKind() != Ctx.LangOpts.CXXStdlib &&
M.getName() != Ctx.Id_Cxx && M.getName() != Ctx.Id_CxxStdlib) {
auto loc = diagLoc.value_or(SourceLoc());
Ctx.Diags.diagnose(loc, diag::cxx_stdlib_kind_mismatch, M.getName(),
to_string(M.getCXXStdlibKind()),
to_string(Ctx.LangOpts.CXXStdlib));
}
return fileUnit;
}