[NFC] AST/ASTDumper: Refactor for recursive MemberTypeRepr representation

Author: AnthonyLatsis

include/swift/AST/TypeRepr.h

@@ -356,7 +356,11 @@ class DeclRefTypeRepr : public TypeRepr {
   /// is a \c MemberTypeRepr, and the method returns its last member component.
   IdentTypeRepr *getLastComponent();
 
-  /// The type declaration the last component is bound to.
+  /// Returns whether this instance has been bound to a type declaration. This
+  /// happens during type resolution.
+  bool isBound() const;
+
+  /// Returns the type declaration this instance has been bound to.
   TypeDecl *getBoundDecl() const;
 
   /// The identifier that describes the last component.

lib/AST/ASTDumper.cpp

@@ -3294,30 +3294,21 @@ class PrintTypeRepr : public TypeReprVisitor<PrintTypeRepr, void, StringRef>,
     printRec(T->getTypeRepr());
   }
 
-  void visitIdentTypeRepr(IdentTypeRepr *T, StringRef label) {
-    printCommon("type_ident", label);
+  void visitDeclRefTypeRepr(DeclRefTypeRepr *T, StringRef label) {
+    printCommon(isa<IdentTypeRepr>(T) ? "type_ident" : "type_member", label);
 
     printFieldQuoted(T->getNameRef(), "id", IdentifierColor);
     if (T->isBound())
       printFieldQuoted(T->getBoundDecl()->printRef(), "bind");
     else
       printFlag("unbound");
 
-    if (auto *GenIdT = dyn_cast<GenericIdentTypeRepr>(T)) {
-      for (auto genArg : GenIdT->getGenericArgs()) {
-        printRec(genArg);
-      }
+    if (auto *memberTR = dyn_cast<MemberTypeRepr>(T)) {
+      printRec(memberTR->getBase());
     }
 
-    printFoot();
-  }
-
-  void visitMemberTypeRepr(MemberTypeRepr *T, StringRef label) {
-    printCommon("type_member", label);
-
-    printRec(T->getRoot());
-    for (auto *comp : T->getMemberComponents()) {
-      printRec(comp);
+    for (auto *genArg : T->getGenericArgs()) {
+      printRec(genArg);
     }
 
     printFoot();

lib/AST/TypeRepr.cpp

@@ -203,6 +203,10 @@ const TypeRepr *DeclRefTypeRepr::getRoot() const {
   return cast<MemberTypeRepr>(this)->getRoot();
 }
 
+bool DeclRefTypeRepr::isBound() const {
+  return const_cast<DeclRefTypeRepr *>(this)->getLastComponent()->isBound();
+}
+
 TypeDecl *DeclRefTypeRepr::getBoundDecl() const {
   return const_cast<DeclRefTypeRepr *>(this)
       ->getLastComponent()

test/Frontend/dump-parse.swift

@@ -126,8 +126,7 @@ struct SelfParam {
 
 // CHECK-LABEL: (func_decl range=[{{.+}}] "dumpMemberTypeRepr()"
 // CHECK-NEXT:    (parameter_list range=[{{.+}}])
-// CHECK-NEXT:    (result=type_member
+// CHECK-NEXT:    (result=type_member id="Element" unbound
 // CHECK-NEXT:      (type_ident id="Array" unbound
 // CHECK-NEXT:        (type_ident id="Bool" unbound))
-// CHECK-NEXT:      (type_ident id="Element" unbound))
 func dumpMemberTypeRepr() -> Array<Bool>.Element { true }