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

AST: Remove ArchetypeType::getSelfProtocol()

Browse Source 
Now that the last usages have been removed, we no longer need
special handling for the 'Self' archetype of a protocol.
This commit is contained in:
Slava Pestov
2016-11-18 23:52:48 -08:00
parent 0948506cc2
commit 2294e33604
7 changed files with 27 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Serialization/Deserialization.cpp
View File

@@ -3609,12 +3609,12 @@ Type ModuleFile::getType(TypeID TID) {
case decls_block::ARCHETYPE_TYPE: {
IdentifierID nameID;
TypeID parentID;
DeclID assocTypeOrProtoID;
DeclID assocTypeID;
TypeID superclassID;
ArrayRef<uint64_t> rawConformanceIDs;
decls_block::ArchetypeTypeLayout::readRecord(scratch, nameID, parentID,
assocTypeOrProtoID,
assocTypeID,
superclassID,
rawConformanceIDs);
@@ -3625,13 +3625,8 @@ Type ModuleFile::getType(TypeID TID) {
if (auto parentType = getType(parentID))
parent = parentType->castTo<ArchetypeType>();
ArchetypeType::AssocTypeOrProtocolType assocTypeOrProto;
auto assocTypeOrProtoDecl = getDecl(assocTypeOrProtoID);
if (auto assocType
= dyn_cast_or_null<AssociatedTypeDecl>(assocTypeOrProtoDecl))
assocTypeOrProto = assocType;
else
assocTypeOrProto = cast_or_null<ProtocolDecl>(assocTypeOrProtoDecl);
auto assocTypeDecl = dyn_cast_or_null<AssociatedTypeDecl>(
getDecl(assocTypeID));
superclass = getType(superclassID);
@@ -3642,7 +3637,7 @@ Type ModuleFile::getType(TypeID TID) {
if (typeOrOffset.isComplete())
break;
auto archetype = ArchetypeType::getNew(ctx, parent, assocTypeOrProto,
auto archetype = ArchetypeType::getNew(ctx, parent, assocTypeDecl,
getIdentifier(nameID), conformances,
superclass, false);
typeOrOffset = archetype;