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

Browse Source
This commit is contained in:
Mike Ash
2019-09-09 12:11:25 -04:00
parent 203dceb5f3 5ad5305614
commit f5e7ab866c
148 changed files with 2703 additions and 1691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/ModuleFile.cpp
View File

@@ -1035,7 +1035,7 @@ bool ModuleFile::readIndexBlock(llvm::BitstreamCursor &cursor) {
break;
case index_block::GENERIC_SIGNATURE_OFFSETS:
assert(blobData.empty());
allocateBuffer(GenericSignaturesAndEnvironments, scratch);
allocateBuffer(GenericSignatures, scratch);
break;
case index_block::SUBSTITUTION_MAP_OFFSETS:
assert(blobData.empty());
@@ -2578,7 +2578,7 @@ bool SerializedASTFile::hasEntryPoint() const {
bool SerializedASTFile::getAllGenericSignatures(
SmallVectorImpl<GenericSignature*> &genericSignatures) {
genericSignatures.clear();
for (unsigned index : indices(File.GenericSignaturesAndEnvironments)) {
for (unsigned index : indices(File.GenericSignatures)) {
if (auto genericSig = File.getGenericSignature(index + 1))
genericSignatures.push_back(genericSig);
}