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

Reapplying: [clang update] Update uses of OnDiskChainedHashTable to the

Browse Source 
OnDiskIterableChainedHashTable interface introduced in CFE 206189.

Thanks to Justin for guiding me through this!
The test-failures I was worried about after I originally committed this
turned out to be unrelated.

Swift SVN r16340
This commit is contained in:
Adrian Prantl
2014-04-14 23:29:47 +00:00
parent f70879c4d9
commit 50d130cb23
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Serialization/ModuleFile.cpp
View File

@@ -245,7 +245,8 @@ ModuleFile::readDeclTable(ArrayRef<uint64_t> fields, StringRef blobData) {
auto base = reinterpret_cast<const uint8_t *>(blobData.data());
using OwnedTable = std::unique_ptr<SerializedDeclTable>;
return OwnedTable(SerializedDeclTable::Create(base + tableOffset, base));
return OwnedTable(SerializedDeclTable::Create(base + tableOffset,
base + sizeof(uint32_t), base));
}
static Optional<KnownProtocolKind> getActualKnownProtocol(unsigned rawKind) {
@@ -437,8 +438,9 @@ ModuleFile::readDeclCommentTable(ArrayRef<uint64_t> fields,
auto base = reinterpret_cast<const uint8_t *>(blobData.data());
return std::unique_ptr<SerializedDeclCommentTable>(
SerializedDeclCommentTable::Create(base + tableOffset, base,
DeclCommentTableInfo(*this)));
SerializedDeclCommentTable::Create(base + tableOffset,
base + sizeof(uint32_t), base,
DeclCommentTableInfo(*this)));
}
bool ModuleFile::readCommentBlock(llvm::BitstreamCursor &cursor) {