Merge pull request #6012 from slavapestov/remove-associated-type-type

AST: Remove AssociatedTypeType

Author: slavapestov

include/swift/AST/TypeMatcher.h

@@ -211,7 +211,6 @@ class TypeMatcher {
     TRIVIAL_CASE(DynamicSelfType)
     TRIVIAL_CASE(ArchetypeType)
     TRIVIAL_CASE(GenericTypeParamType)
-    TRIVIAL_CASE(AssociatedTypeType)
 
     bool visitDependentMemberType(CanDependentMemberType firstDepMember,
                                   Type secondType) {

include/swift/AST/TypeNodes.def

@@ -118,7 +118,6 @@ ABSTRACT_TYPE(Substitutable, Type)
   ALWAYS_CANONICAL_TYPE(Archetype, SubstitutableType)
   TYPE(GenericTypeParam, SubstitutableType)
   TYPE_RANGE(Substitutable, Archetype, GenericTypeParam)
-SUGARED_TYPE(AssociatedType, Type)
 SUGARED_TYPE(Substituted, Type)
 TYPE(DependentMember, Type)
 ABSTRACT_TYPE(AnyFunction, Type)

include/swift/AST/Types.h

@@ -4064,36 +4064,6 @@ BEGIN_CAN_TYPE_WRAPPER(GenericTypeParamType, SubstitutableType)
   }
 END_CAN_TYPE_WRAPPER(GenericTypeParamType, SubstitutableType)
 
-/// Describes the type of an associated type.
-///
-/// \sa AssociatedTypeDecl
-class AssociatedTypeType : public TypeBase {
-  /// The generic type parameter.
-  AssociatedTypeDecl *AssocType;
-
-public:
-  /// Retrieve the declaration of the associated type.
-  AssociatedTypeDecl *getDecl() const { return AssocType; }
-
-  /// Remove one level of top-level sugar from this type.
-  TypeBase *getSinglyDesugaredType();
-
-  // Implement isa/cast/dyncast/etc.
-  static bool classof(const TypeBase *T) {
-    return T->getKind() == TypeKind::AssociatedType;
-  }
-
-private:
-  friend class AssociatedTypeDecl;
-
-  // These aren't classified as dependent for some reason.
-
-  AssociatedTypeType(AssociatedTypeDecl *assocType)
-    : TypeBase(TypeKind::AssociatedType, nullptr, RecursiveTypeProperties()),
-      AssocType(assocType) { }
-};
-DEFINE_EMPTY_CAN_TYPE_WRAPPER(AssociatedTypeType, Type)
-
 /// SubstitutedType - A type that has been substituted for some other type,
 /// which implies that the replacement type meets all of the requirements of
 /// the original type.

include/swift/Serialization/DeclTypeRecordNodes.def

@@ -80,7 +80,6 @@
 // VERSION_MAJOR in ModuleFormat.h. Names, however, may change.
 FIRST_TYPE(NAME_ALIAS, 1)
 TYPE(GENERIC_TYPE_PARAM)
-TYPE(ASSOCIATED_TYPE) // This is correct! ASSOCIATED_TYPE_TYPE
 TYPE(DEPENDENT_MEMBER)
 TYPE(NOMINAL)
 TYPE(PAREN)

include/swift/Serialization/ModuleFormat.h

@@ -54,7 +54,7 @@ const uint16_t VERSION_MAJOR = 0;
 /// in source control, you should also update the comment to briefly
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
-const uint16_t VERSION_MINOR = 288; // Last change: remove context type from subscript
+const uint16_t VERSION_MINOR = 289; // Last change: remove AssociatedTypeType
 
 using DeclID = PointerEmbeddedInt<unsigned, 31>;
 using DeclIDField = BCFixed<31>;
@@ -553,11 +553,6 @@ namespace decls_block {
     BCVBR<4>     // index + 1, or zero if we have a generic type parameter decl
   >;
 
-  using AssociatedTypeTypeLayout = BCRecordLayout<
-    ASSOCIATED_TYPE_TYPE,
-    DeclIDField // associated type decl
-  >;
-
   using DependentMemberTypeLayout = BCRecordLayout<
     DEPENDENT_MEMBER_TYPE,
     TypeIDField,      // base type

lib/AST/ASTDumper.cpp

@@ -2855,12 +2855,6 @@ namespace {
       OS << ")";
     }
 
-    void visitAssociatedTypeType(AssociatedTypeType *T, StringRef label) {
-      printCommon(T, label, "associated_type_type");
-      printField("decl", T->getDecl()->printRef());
-      OS << ")";
-    }
-
     void visitSubstitutedType(SubstitutedType *T, StringRef label) {
       printCommon(T, label, "substituted_type");
       printRec("original", T->getOriginal());

lib/AST/ASTPrinter.cpp

@@ -3615,11 +3615,6 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
 
     // We spell normal metatypes of existential types as .Protocol.
     if (isa<MetatypeType>(T) &&
-        // Special case AssociatedTypeType's here, since they may not be fully
-        // set up within the type checker (preventing getCanonicalType from
-        // working), and we want type printing to always work even in malformed
-        // programs half way through the type checker.
-        !isa<AssociatedTypeType>(T->getInstanceType().getPointer()) &&
         T->getInstanceType()->isAnyExistentialType()) {
       Printer << ".Protocol";
     } else {
@@ -4010,14 +4005,6 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
     }
   }
 
-  void visitAssociatedTypeType(AssociatedTypeType *T) {
-    auto Name = T->getDecl()->getName();
-    if (Name.empty())
-      Printer << "<anonymous>";
-    else
-      Printer.printName(Name);
-  }
-
   void visitSubstitutedType(SubstitutedType *T) {
     visit(T->getReplacementType());
   }

lib/AST/Mangle.cpp

@@ -852,8 +852,6 @@ void Mangler::mangleType(Type type, unsigned uncurryLevel) {
 
   case TypeKind::Paren:
     return mangleSugaredType<ParenType>(type);
-  case TypeKind::AssociatedType:
-    return mangleSugaredType<AssociatedTypeType>(type);
   case TypeKind::Substituted:
     return mangleSugaredType<SubstitutedType>(type);
   case TypeKind::ArraySlice: /* fallthrough */

lib/AST/Type.cpp

@@ -1430,13 +1430,6 @@ Identifier GenericTypeParamType::getName() const {
   return name;
 }
 
-TypeBase *AssociatedTypeType::getSinglyDesugaredType() {
-  auto protocolSelf = getDecl()->getProtocol()->getSelfTypeInContext();
-  assert(protocolSelf);
-  auto *selfArchetype = protocolSelf->castTo<ArchetypeType>();
-  return selfArchetype->getNestedTypeValue(getDecl()->getName()).getPointer();
-}
-
 const llvm::fltSemantics &BuiltinFloatType::getAPFloatSemantics() const {
   switch (getFPKind()) {
   case BuiltinFloatType::IEEE16:  return APFloat::IEEEhalf;
@@ -1469,7 +1462,6 @@ bool TypeBase::isSpelledLike(Type other) {
   case TypeKind::Class:
   case TypeKind::NameAlias:
   case TypeKind::Substituted:
-  case TypeKind::AssociatedType:
   case TypeKind::GenericTypeParam:
   case TypeKind::DependentMember:
   case TypeKind::DynamicSelf:
@@ -3122,7 +3114,6 @@ case TypeKind::Id:
   case TypeKind::Error:
   case TypeKind::Unresolved:
   case TypeKind::TypeVariable:
-  case TypeKind::AssociatedType:
   case TypeKind::GenericTypeParam:
     return *this;
 

lib/AST/TypeWalker.cpp

@@ -67,7 +67,6 @@ class Traversal : public TypeVisitor<Traversal, bool>
     return doIt(ty->getSelfType());
   }
   bool visitSubstitutableType(SubstitutableType *ty) { return false; }
-  bool visitAssociatedTypeType(AssociatedTypeType *ty) { return false; }
 
   bool visitSubstitutedType(SubstitutedType *ty) {
     if (Walker.shouldVisitOriginalSubstitutedType())

lib/IRGen/DebugTypeInfo.cpp

@@ -166,8 +166,6 @@ TypeDecl *DebugTypeInfo::getDecl() const {
     return UBG->getDecl();
   if (auto *BG = dyn_cast<BoundGenericType>(Type))
     return BG->getDecl();
-  if (auto *AT = dyn_cast<AssociatedTypeType>(Type))
-    return AT->getDecl();
   return nullptr;
 }
 

lib/IRGen/IRGenDebugInfo.cpp

@@ -1742,7 +1742,6 @@ llvm::DIType *IRGenDebugInfo::createType(DebugTypeInfo DbgTy,
 
   // The following types exist primarily for internal use by the type
   // checker.
-  case TypeKind::AssociatedType:
   case TypeKind::Error:
   case TypeKind::Unresolved:
   case TypeKind::LValue:

lib/Serialization/Deserialization.cpp

@@ -3734,25 +3734,6 @@ Type ModuleFile::getType(TypeID TID) {
     break;
   }
 
-  case decls_block::ASSOCIATED_TYPE_TYPE: {
-    DeclID declID;
-
-    decls_block::AssociatedTypeTypeLayout::readRecord(scratch, declID);
-
-    auto assocType = dyn_cast_or_null<AssociatedTypeDecl>(getDecl(declID));
-    if (!assocType) {
-      error();
-      return nullptr;
-    }
-
-    // See if we triggered deserialization through our conformances.
-    if (typeOrOffset.isComplete())
-      break;
-
-    typeOrOffset = assocType->getType()->castTo<MetatypeType>()->getInstanceType();
-    break;
-  }
-
   case decls_block::PROTOCOL_COMPOSITION_TYPE: {
     ArrayRef<uint64_t> rawProtocolIDs;
 

lib/Serialization/Serialization.cpp

@@ -3018,14 +3018,6 @@ void Serializer::writeType(Type ty) {
     break;
   }
 
-  case TypeKind::AssociatedType: {
-    auto assocType = cast<AssociatedTypeType>(ty.getPointer());
-    unsigned abbrCode = DeclTypeAbbrCodes[AssociatedTypeTypeLayout::Code];
-    AssociatedTypeTypeLayout::emitRecord(Out, ScratchRecord, abbrCode,
-                                         addDeclRef(assocType->getDecl()));
-    break;
-  }
-
   case TypeKind::Substituted: {
     auto subTy = cast<SubstitutedType>(ty.getPointer());
 
@@ -3304,7 +3296,6 @@ void Serializer::writeAllDeclsAndTypes() {
 
   registerDeclTypeAbbr<TypeAliasLayout>();
   registerDeclTypeAbbr<GenericTypeParamTypeLayout>();
-  registerDeclTypeAbbr<AssociatedTypeTypeLayout>();
   registerDeclTypeAbbr<DependentMemberTypeLayout>();
   registerDeclTypeAbbr<StructLayout>();
   registerDeclTypeAbbr<ConstructorLayout>();