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 #70335 from artemcm/DepScanSkipSwiftDependencyClangSearchPaths

Browse Source 
[Explicit Moduele Builds] Look through forwarding modules for `canImport` version check.
This commit is contained in:
Artem Chikin
2023-12-08 18:40:13 -08:00
committed by GitHub
parent e052833f1d 22d39e91e7
commit 1a60dae74a
2 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -2244,6 +2244,21 @@ bool ExplicitSwiftModuleLoader::canImportModule(
it->second.modulePath);
return false;
}
// If it's a forwarding module, load the YAML file from disk and get the path
// to the actual module for the version check.
if (!serialization::isSerializedAST((*moduleBuf)->getBuffer())) {
if (auto forwardingModule = ForwardingModule::load(**moduleBuf)) {
moduleBuf = fs.getBufferForFile(forwardingModule->underlyingModulePath);
if (!moduleBuf) {
Ctx.Diags.diagnose(SourceLoc(),
diag::error_opening_explicit_module_file,
forwardingModule->underlyingModulePath);
return false;
}
}
}
auto metaData = serialization::validateSerializedAST(
(*moduleBuf)->getBuffer(), Ctx.SILOpts.EnableOSSAModules,
Ctx.LangOpts.SDKName);