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

Browse Source
This commit is contained in:
Arnold Schwaighofer
2019-08-28 10:26:00 -07:00
parent 4fce27b311 faaa3a859d
commit a1e9ccfd53
41 changed files with 2145 additions and 1056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Serialization/ModuleFile.cpp
View File

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