AST: Allow passing arbitrary parent TypeRepr to TypeExpr::createForMemberDecl

Author: AnthonyLatsis

include/swift/AST/Expr.h

@@ -1340,9 +1340,9 @@ class TypeExpr : public Expr {
                                        TypeDecl *Decl);
 
   /// Create a \c TypeExpr for a member \c TypeDecl of the given parent
-  /// \c DeclRefTypeRepr.
-  static TypeExpr *createForMemberDecl(DeclRefTypeRepr *ParentTR,
-                                       DeclNameLoc NameLoc, TypeDecl *Decl);
+  /// \c TypeRepr.
+  static TypeExpr *createForMemberDecl(TypeRepr *ParentTR, DeclNameLoc NameLoc,
+                                       TypeDecl *Decl);
 
   /// Create a \c TypeExpr from an \c DeclRefTypeRepr with the given arguments
   /// applied at the specified location.

lib/AST/Expr.cpp

@@ -2224,24 +2224,29 @@ TypeExpr *TypeExpr::createForMemberDecl(DeclNameLoc ParentNameLoc,
   return new (C) TypeExpr(TR);
 }
 
-TypeExpr *TypeExpr::createForMemberDecl(DeclRefTypeRepr *ParentTR,
-                                        DeclNameLoc NameLoc, TypeDecl *Decl) {
+TypeExpr *TypeExpr::createForMemberDecl(TypeRepr *ParentTR, DeclNameLoc NameLoc,
+                                        TypeDecl *Decl) {
   ASTContext &C = Decl->getASTContext();
 
-  // Create a new list of components.
-  SmallVector<IdentTypeRepr *, 2> Components;
-  if (auto *MemberTR = dyn_cast<MemberTypeRepr>(ParentTR)) {
-    auto MemberComps = MemberTR->getMemberComponents();
-    Components.append(MemberComps.begin(), MemberComps.end());
-  }
-
   // Add a new component for the member we just found.
   auto *NewComp = new (C) SimpleIdentTypeRepr(NameLoc, Decl->createNameRef());
   NewComp->setValue(Decl, nullptr);
-  Components.push_back(NewComp);
 
-  auto *TR =
-      MemberTypeRepr::create(C, ParentTR->getBaseComponent(), Components);
+  TypeRepr *TR = nullptr;
+  if (auto *DeclRefTR = dyn_cast<DeclRefTypeRepr>(ParentTR)) {
+    // Create a new list of components.
+    SmallVector<IdentTypeRepr *, 4> Components;
+    if (auto *MemberTR = dyn_cast<MemberTypeRepr>(ParentTR)) {
+      auto MemberComps = MemberTR->getMemberComponents();
+      Components.append(MemberComps.begin(), MemberComps.end());
+    }
+
+    Components.push_back(NewComp);
+    TR = MemberTypeRepr::create(C, DeclRefTR->getBaseComponent(), Components);
+  } else {
+    TR = MemberTypeRepr::create(C, ParentTR, NewComp);
+  }
+
   return new (C) TypeExpr(TR);
 }