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

AST: cache serialized source locations in Decl

Browse Source
This commit is contained in:
Xi Ge
2019-10-14 15:41:58 -07:00
parent 1e22e7c8aa
commit c6035f68f0
4 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Basic/SourceLoc.cpp
View File

@@ -357,16 +357,16 @@ llvm::Optional<unsigned> SourceManager::resolveFromLineCol(unsigned BufferId,
return None;
}
Optional<unsigned> SourceManager::getExternalSourceBufferId(StringRef Path) {
unsigned SourceManager::getExternalSourceBufferId(StringRef Path) {
auto It = ExternalBufferId.find(Path.data());
if (It != ExternalBufferId.end()) {
return It->second;
}
unsigned Id = 0u;
auto InputFileOrErr = swift::vfs::getFileOrSTDIN(*getFileSystem(), Path);
if (!InputFileOrErr) {
return None;
if (InputFileOrErr) {
Id = addNewSourceBuffer(std::move(InputFileOrErr.get()));
}
auto Id = addNewSourceBuffer(std::move(InputFileOrErr.get()));
ExternalBufferId.insert({Path.data(), Id});
return Id;
}
@@ -375,10 +375,10 @@ SourceLoc
SourceManager::getLocFromExternalSource(StringRef Path, unsigned Line,
unsigned Col) {
auto BufferId = getExternalSourceBufferId(Path);
if (!BufferId.hasValue())
if (BufferId == 0u)
return SourceLoc();
auto Offset = resolveFromLineCol(*BufferId, Line, Col);
auto Offset = resolveFromLineCol(BufferId, Line, Col);
if (!Offset.hasValue())
return SourceLoc();
return getLocForOffset(*BufferId, *Offset);
return getLocForOffset(BufferId, *Offset);
}