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

Allow users to opt-out of implicit Cxx import with -disable-implicit-cxx-module-import

Browse Source
This commit is contained in:
artemcm
2024-05-15 14:30:23 -04:00
parent 6ea604bf9f
commit ec4e0e23aa
10 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -1031,7 +1031,8 @@ LoadedFile *SerializedModuleLoaderBase::loadAST(
if (M.hasCxxInteroperability() &&
M.getResilienceStrategy() != ResilienceStrategy::Resilient &&
!Ctx.LangOpts.EnableCXXInterop &&
Ctx.LangOpts.RequireCxxInteropToImportCxxInteropModule) {
Ctx.LangOpts.RequireCxxInteropToImportCxxInteropModule &&
M.getName().str() != CXX_MODULE_NAME) {
auto loc = diagLoc.value_or(SourceLoc());
Ctx.Diags.diagnose(loc, diag::need_cxx_interop_to_import_module,
M.getName());