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 #81908 from artemcm/FixImplicitBuildCXXInteropCycle

Browse Source 
[C++Interop] Do not query C++ Standard Library Swift overlays when building Swift modules which were built without C++ interop
This commit is contained in:
Artem Chikin
2025-06-02 23:26:27 -07:00
committed by GitHub
parent 10f0f6108c 5b501ad2c5
commit 4fb4945ab9
8 changed files with 128 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/DependencyScan/ModuleDependencyScanner.cpp
View File

@@ -1477,7 +1477,13 @@ void ModuleDependencyScanner::resolveSwiftOverlayDependenciesForModule(
// If the textual interface was built without C++ interop, do not query
// the C++ Standard Library Swift overlay for its compilation.
if (llvm::find(commandLine, "-formal-cxx-interoperability-mode=off") ==
//
// FIXME: We always declare the 'Darwin' module as formally having been built
// without C++Interop, for compatibility with prior versions. Once we are certain
// that we are only building against modules built with support of
// '-formal-cxx-interoperability-mode', this hard-coded check should be removed.
if (moduleID.ModuleName != "Darwin" &&
llvm::find(commandLine, "-formal-cxx-interoperability-mode=off") ==
commandLine.end()) {
for (const auto &clangDepName : allClangDependencies) {
// If this Clang module is a part of the C++ stdlib, and we haven't