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
2016-12-13 10:23:03 -08:00
parent 4081418e04 3ac7ab193a
commit deddf19aae
703 changed files with 12297 additions and 6112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/ModuleFile.cpp
View File

@@ -539,6 +539,10 @@ bool ModuleFile::readIndexBlock(llvm::BitstreamCursor &cursor) {
assert(blobData.empty());
NormalConformances.assign(scratch.begin(), scratch.end());
break;
case index_block::SIL_LAYOUT_OFFSETS:
assert(blobData.empty());
SILLayouts.assign(scratch.begin(), scratch.end());
break;
default:
// Unknown index kind, which this version of the compiler won't use.