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

SR-11889: Using Located<T> instead of std::pair<SourceLoc, T>

Browse Source
This commit is contained in:
Kita, Maksim
2019-12-08 22:51:48 +03:00
parent 06014e6226
commit b7cb3b67bf
38 changed files with 209 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -340,7 +340,7 @@ struct ModuleRebuildInfo {
/// normal cache, the prebuilt cache, a module adjacent to the interface, or
/// a module that we'll build from a module interface.
class ModuleInterfaceLoaderImpl {
using AccessPathElem = std::pair<Identifier, SourceLoc>;
using AccessPathElem = Located<Identifier>;
friend class swift::ModuleInterfaceLoader;
ASTContext &ctx;
llvm::vfs::FileSystem &fs;
@@ -1020,10 +1020,10 @@ std::error_code ModuleInterfaceLoader::findModuleFilesInDirectory(
}
// Create an instance of the Impl to do the heavy lifting.
auto ModuleName = ModuleID.first.str();
auto ModuleName = ModuleID.item.str();
ModuleInterfaceLoaderImpl Impl(
Ctx, ModPath, InPath, ModuleName,
CacheDir, PrebuiltCacheDir, ModuleID.second,
CacheDir, PrebuiltCacheDir, ModuleID.loc,
RemarkOnRebuildFromInterface, dependencyTracker,
llvm::is_contained(PreferInterfaceForModules,
ModuleName) ?