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 'apple/master' into master-next

Browse Source
This commit is contained in:
Xi Ge
2019-10-28 10:19:36 -07:00
parent cc1f4f000b fd1a2a42ae
commit 64c0680686
609 changed files with 15200 additions and 14950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Serialization/ModuleFile.cpp
View File

@@ -1402,7 +1402,7 @@ public:
std::unique_ptr<ModuleFile::SerializedDeclUSRTable>
ModuleFile::readDeclUSRsTable(ArrayRef<uint64_t> fields, StringRef blobData) {
if (fields.empty() || blobData.empty())
return nullptr;
return nullptr;
uint32_t tableOffset = static_cast<uint32_t>(fields.front());
auto base = reinterpret_cast<const uint8_t *>(blobData.data());
return std::unique_ptr<SerializedDeclUSRTable>(
@@ -2610,6 +2610,8 @@ Optional<CommentInfo> ModuleFile::getCommentForDecl(const Decl *D) const {
if (!DeclCommentTable)
return None;
if (D->isImplicit())
return None;
// Compute the USR.
llvm::SmallString<128> USRBuffer;
llvm::raw_svector_ostream OS(USRBuffer);
@@ -2634,6 +2636,8 @@ ModuleFile::getBasicDeclLocsForDecl(const Decl *D) const {
// Future compilers may not provide BasicDeclLocsData anymore.
if (BasicDeclLocsData.empty())
return None;
if (D->isImplicit())
return None;
// Compute the USR.
llvm::SmallString<128> USRBuffer;
llvm::raw_svector_ostream OS(USRBuffer);