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

[serialization] Fix another cursor-clobbering mistake.

Browse Source 
When reading trailing records, make sure we don't go off and read something
else in the mean time...

Swift SVN r6518
This commit is contained in:
Jordan Rose
2013-07-23 23:10:02 +00:00
parent b619a125a1
commit 36138474d1
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Serialization/ModuleFile.cpp
View File

@@ -1700,11 +1700,17 @@ Type ModuleFile::getType(TypeID TID) {
decls_block::BoundGenericTypeLayout::readRecord(scratch, declID, parentID,
rawArgumentIDs);
SmallVector<Type, 8> genericArgs;
for (TypeID type : rawArgumentIDs)
genericArgs.push_back(getType(type));
NominalTypeDecl *nominal;
Type parentTy;
{
BCOffsetRAII restoreOffset(DeclTypeCursor);
for (TypeID type : rawArgumentIDs)
genericArgs.push_back(getType(type));
nominal = cast<NominalTypeDecl>(getDecl(declID));
parentTy = getType(parentID);
}
auto boundTy = BoundGenericType::get(cast<NominalTypeDecl>(getDecl(declID)),
getType(parentID), genericArgs);
auto boundTy = BoundGenericType::get(nominal, parentTy, genericArgs);
typeOrOffset = boundTy;
// BoundGenericTypes get uniqued in the ASTContext, so it's possible this