averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift_jenkins
2020-02-19 16:19:27 -08:00
parent a6ae1dc246 b0b927ba2c
commit 5806fd0f63
51 changed files with 979 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -999,7 +999,8 @@ std::error_code ModuleInterfaceLoader::findModuleFilesInDirectory(
llvm::SmallString<256>
ModPath{ BaseName.getName(file_types::TY_SwiftModuleFile) },
InPath{ BaseName.getName(file_types::TY_SwiftModuleInterfaceFile) };
InPath{ BaseName.getName(file_types::TY_SwiftModuleInterfaceFile) },
PrivateInPath{BaseName.getName(file_types::TY_PrivateSwiftModuleInterfaceFile)};
// First check to see if the .swiftinterface exists at all. Bail if not.
auto &fs = *Ctx.SourceMgr.getFileSystem();
@@ -1013,6 +1014,11 @@ std::error_code ModuleInterfaceLoader::findModuleFilesInDirectory(
return std::make_error_code(std::errc::no_such_file_or_directory);
}
// If present, use the private interface instead of the public one.
if (fs.exists(PrivateInPath)) {
InPath = PrivateInPath;
}
// Create an instance of the Impl to do the heavy lifting.
auto ModuleName = ModuleID.Item.str();
ModuleInterfaceLoaderImpl Impl(