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

[cxx-interop] Always import cxx shim when cxx-interop is enabled (#60336)

Browse Source
This commit is contained in:
Ehud Adler
2022-08-05 08:28:47 -04:00
committed by GitHub
parent 182946e6be
commit f11e2afe07
8 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Frontend/Frontend.cpp
View File

@@ -861,6 +861,14 @@ bool CompilerInstance::canImportSwiftStringProcessing() const {
return getASTContext().canImportModule(modulePath);
}
bool CompilerInstance::canImportCxxShim() const {
ImportPath::Module::Builder builder(
getASTContext().getIdentifier(CXX_SHIM_NAME));
auto modulePath = builder.get();
return getASTContext().canImportModule(modulePath) &&
!Invocation.getFrontendOptions().InputsAndOutputs.hasModuleInterfaceOutputPath();
}
ImplicitImportInfo CompilerInstance::getImplicitImportInfo() const {
auto &frontendOpts = Invocation.getFrontendOptions();
@@ -915,6 +923,10 @@ ImplicitImportInfo CompilerInstance::getImplicitImportInfo() const {
}
}
if (Invocation.getLangOptions().EnableCXXInterop && canImportCxxShim()) {
pushImport(CXX_SHIM_NAME);
}
imports.ShouldImportUnderlyingModule = frontendOpts.ImportUnderlyingModule;
imports.BridgingHeaderPath = frontendOpts.ImplicitObjCHeaderPath;
return imports;