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

[ModuleInterface] Short-circuit module loading for frameworks too (#24459)

Browse Source 
Follow-up to 7969705 that handles frameworks as well. Oops.

rdar://problem/50070463
This commit is contained in:
Jordan Rose
2019-05-03 11:11:07 -07:00
committed by GitHub
parent 8732188afe
commit f76d2c3976
3 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -264,24 +264,24 @@ SerializedModuleLoaderBase::findModule(AccessPathElem moduleID,
moduleFramework += ".framework";
isFramework = true;
auto tryFrameworkImport = [&](StringRef frameworkPath) -> bool {
auto tryFrameworkImport = [&](StringRef frameworkPath) -> Optional<bool> {
currPath = frameworkPath;
llvm::sys::path::append(currPath, moduleFramework.str());
// Check if the framework directory exists
if (!fs.exists(currPath)) {
return false;
return None;
}
// Frameworks always use architecture-specific files within a .swiftmodule
// directory.
llvm::sys::path::append(currPath, "Modules", fileNames.module.str());
return findTargetSpecificModuleFiles().getValueOr(false);
return findTargetSpecificModuleFiles();
};
for (const auto &framepath : Ctx.SearchPathOpts.FrameworkSearchPaths) {
if (tryFrameworkImport(framepath.Path))
return true;
if (auto outcome = tryFrameworkImport(framepath.Path))
return outcome.getValue();
}
if (Ctx.LangOpts.Target.isOSDarwin()) {
@@ -290,13 +290,13 @@ SerializedModuleLoaderBase::findModule(AccessPathElem moduleID,
SmallString<256> scratch;
scratch = Ctx.SearchPathOpts.SDKPath;
llvm::sys::path::append(scratch, "System", "Library", "Frameworks");
if (tryFrameworkImport(scratch))
return true;
if (auto outcome = tryFrameworkImport(scratch))
return outcome.getValue();
scratch = Ctx.SearchPathOpts.SDKPath;
llvm::sys::path::append(scratch, "Library", "Frameworks");
if (tryFrameworkImport(scratch))
return true;
if (auto outcome = tryFrameworkImport(scratch))
return outcome.getValue();
}
}