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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
Bob Wilson
2017-01-03 14:22:59 -08:00
parent f9968c4795 9cebf0a637
commit 78b28243ff
808 changed files with 30720 additions and 8657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Serialization/ModuleFile.cpp
View File

@@ -288,7 +288,7 @@ namespace {
explicit PrettyModuleFileDeserialization(const ModuleFile &file)
: File(file) {}
virtual void print(raw_ostream &os) const override {
void print(raw_ostream &os) const override {
os << "While reading from " << File.getModuleFilename() << "\n";
}
};
@@ -535,6 +535,10 @@ bool ModuleFile::readIndexBlock(llvm::BitstreamCursor &cursor) {
assert(blobData.empty());
LocalDeclContexts.assign(scratch.begin(), scratch.end());
break;
case index_block::GENERIC_ENVIRONMENT_OFFSETS:
assert(blobData.empty());
GenericEnvironments.assign(scratch.begin(), scratch.end());
break;
case index_block::NORMAL_CONFORMANCE_OFFSETS:
assert(blobData.empty());
NormalConformances.assign(scratch.begin(), scratch.end());