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

ModulePrinting: Fix several issues pointed by Ben.

Browse Source
This commit is contained in:
Xi Ge
2016-03-08 17:57:40 -08:00
parent ce12c6dc95
commit 09cd9c1f9d
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Serialization/ModuleFile.cpp
View File

@@ -1540,7 +1540,7 @@ Optional<CommentInfo> ModuleFile::getCommentForDecl(const Decl *D) const {
return getCommentForDeclByUSR(USRBuffer.str());
}
const static std::string Separator = "/";
const static StringRef Separator = "/";
static const Decl* getGroupDecl(const Decl *D) {
auto GroupD = D;
@@ -1559,7 +1559,9 @@ Optional<StringRef> ModuleFile::getGroupNameById(unsigned Id) const {
auto Original = (*GroupNamesMap)[Id];
if (Original.empty())
return None;
return StringRef(Original.data(), Original.find_last_of(Separator));
auto SepPos = Original.find_last_of(Separator);
assert(SepPos != StringRef::npos && "Cannot find Separator.");
return StringRef(Original.data(), SepPos);
}
Optional<StringRef> ModuleFile::getSourceFileNameById(unsigned Id) const {
@@ -1569,6 +1571,7 @@ Optional<StringRef> ModuleFile::getSourceFileNameById(unsigned Id) const {
if (Original.empty())
return None;
auto SepPos = Original.find_last_of(Separator);
assert(SepPos != StringRef::npos && "Cannot find Separator.");
auto Start = Original.data() + SepPos + 1;
auto Len = Original.size() - SepPos - 1;
return StringRef(Start, Len);