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 remote-tracking branch 'origin/master' into master-rebranch

Browse Source
This commit is contained in:
swift-ci
2020-07-22 12:04:54 -07:00
parent d57ca9cdaf bd03c47506
commit 627ed18e79
14 changed files with 145 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -116,7 +116,7 @@ SerializedModuleLoaderBase::SerializedModuleLoaderBase(
IgnoreSwiftSourceInfoFile(IgnoreSwiftSourceInfoFile) {}
SerializedModuleLoaderBase::~SerializedModuleLoaderBase() = default;
SerializedModuleLoader::~SerializedModuleLoader() = default;
ImplicitSerializedModuleLoader::~ImplicitSerializedModuleLoader() = default;
MemoryBufferSerializedModuleLoader::~MemoryBufferSerializedModuleLoader() =
default;
@@ -244,7 +244,7 @@ void SerializedModuleLoaderBase::collectVisibleTopLevelModuleNamesImpl(
});
}
void SerializedModuleLoader::collectVisibleTopLevelModuleNames(
void ImplicitSerializedModuleLoader::collectVisibleTopLevelModuleNames(
SmallVectorImpl<Identifier> &names) const {
collectVisibleTopLevelModuleNamesImpl(
names, file_types::getExtension(file_types::TY_SwiftModuleFile));
@@ -415,7 +415,7 @@ llvm::ErrorOr<ModuleDependencies> SerializedModuleLoaderBase::scanModuleFile(
return std::move(dependencies);
}
std::error_code SerializedModuleLoader::findModuleFilesInDirectory(
std::error_code ImplicitSerializedModuleLoader::findModuleFilesInDirectory(
AccessPathElem ModuleID,
const SerializedModuleBaseName &BaseName,
SmallVectorImpl<char> *ModuleInterfacePath,
@@ -452,7 +452,7 @@ std::error_code SerializedModuleLoader::findModuleFilesInDirectory(
return std::error_code();
}
bool SerializedModuleLoader::maybeDiagnoseTargetMismatch(
bool ImplicitSerializedModuleLoader::maybeDiagnoseTargetMismatch(
SourceLoc sourceLocation, StringRef moduleName,
const SerializedModuleBaseName &absoluteBaseName) {
llvm::vfs::FileSystem &fs = *Ctx.SourceMgr.getFileSystem();