[NFC] AST: Remove IdentTypeRepr::create

Author: AnthonyLatsis

include/swift/AST/TypeRepr.h

@@ -256,11 +256,6 @@ class IdentTypeRepr : public TypeRepr {
   explicit IdentTypeRepr(TypeReprKind K) : TypeRepr(K) {}
 
 public:
-  /// Copies the provided array and creates a CompoundIdentTypeRepr or just
-  /// returns the single entry in the array if it contains only one.
-  static IdentTypeRepr *create(ASTContext &C,
-                               ArrayRef<ComponentIdentTypeRepr *> Components);
-  
   class ComponentRange;
   inline ComponentRange getComponentRange();
 

lib/AST/CASTBridging.cpp

@@ -497,10 +497,14 @@ void *TupleTypeRepr_create(void *ctx, BridgedArrayRef elements, void *lParenLoc,
                                SourceRange{lParen, rParen});
 }
 
-void *IdentTypeRepr_create(void *ctx, BridgedArrayRef components) {
+void *IdentTypeRepr_create(void *ctx, BridgedArrayRef bridgedComponents) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
-  return IdentTypeRepr::create(
-      Context, getArrayRef<ComponentIdentTypeRepr *>(components));
+  auto components = getArrayRef<ComponentIdentTypeRepr *>(bridgedComponents);
+  if (components.size() == 1) {
+    return components.front();
+  }
+
+  return CompoundIdentTypeRepr::create(Context, components);
 }
 
 void *CompositionTypeRepr_create(void *ctx, BridgedArrayRef types,

lib/AST/Expr.cpp

@@ -2225,7 +2225,7 @@ TypeExpr *TypeExpr::createForMemberDecl(DeclNameLoc ParentNameLoc,
   NewComp->setValue(Decl, nullptr);
   Components.push_back(NewComp);
 
-  auto *NewTypeRepr = IdentTypeRepr::create(C, Components);
+  auto *NewTypeRepr = CompoundIdentTypeRepr::create(C, Components);
   return new (C) TypeExpr(NewTypeRepr);
 }
 
@@ -2246,7 +2246,7 @@ TypeExpr *TypeExpr::createForMemberDecl(IdentTypeRepr *ParentTR,
   NewComp->setValue(Decl, nullptr);
   Components.push_back(NewComp);
 
-  auto *NewTypeRepr = IdentTypeRepr::create(C, Components);
+  auto *NewTypeRepr = CompoundIdentTypeRepr::create(C, Components);
   return new (C) TypeExpr(NewTypeRepr);
 }
 
@@ -2295,7 +2295,12 @@ TypeExpr *TypeExpr::createForSpecializedDecl(IdentTypeRepr *ParentTR,
     genericComp->setValue(last->getBoundDecl(), last->getDeclContext());
     components.push_back(genericComp);
 
-    auto *genericRepr = IdentTypeRepr::create(C, components);
+    TypeRepr *genericRepr = nullptr;
+    if (components.size() == 1) {
+      genericRepr = components.front();
+    } else {
+      genericRepr = CompoundIdentTypeRepr::create(C, components);
+    }
     return new (C) TypeExpr(genericRepr);
   }
 

lib/AST/NameLookup.cpp

@@ -3076,7 +3076,8 @@ CustomAttrNominalRequest::evaluate(Evaluator &evaluator,
               identTypeRepr
             };
 
-            auto *newTE = new (ctx) TypeExpr(IdentTypeRepr::create(ctx, components));
+            auto *newTE = new (ctx)
+                TypeExpr(CompoundIdentTypeRepr::create(ctx, components));
             attr->resetTypeInformation(newTE);
             return nominal;
           }

lib/AST/TypeRepr.cpp

@@ -245,15 +245,6 @@ void AttributedTypeRepr::printAttrs(ASTPrinter &Printer,
     Printer.printSimpleAttr("@_noMetadata") << " ";
 }
 
-IdentTypeRepr *IdentTypeRepr::create(ASTContext &C,
-                                ArrayRef<ComponentIdentTypeRepr *> Components) {
-  assert(!Components.empty());
-  if (Components.size() == 1)
-    return Components.front();
-
-  return CompoundIdentTypeRepr::create(C, Components);
-}
-
 static void printGenericArgs(ASTPrinter &Printer, const PrintOptions &Opts,
                              ArrayRef<TypeRepr *> Args) {
   if (Args.empty())

lib/Parse/ParseType.cpp

@@ -752,7 +752,11 @@ Parser::parseTypeIdentifier(bool isParsingQualifiedDeclBaseType) {
 
   IdentTypeRepr *ITR = nullptr;
   if (!ComponentsR.empty()) {
-    ITR = IdentTypeRepr::create(Context, ComponentsR);
+    if (ComponentsR.size() == 1) {
+      ITR = ComponentsR.front();
+    } else {
+      ITR = CompoundIdentTypeRepr::create(Context, ComponentsR);
+    }
   }
 
   if (Status.hasCodeCompletion()) {

lib/Sema/TypeCheckPattern.cpp

@@ -482,7 +482,12 @@ class ResolvePattern : public ASTVisitor<ResolvePattern,
     const auto options =
         TypeResolutionOptions(None) | TypeResolutionFlags::SilenceErrors;
 
-    auto *repr = IdentTypeRepr::create(Context, components);
+    IdentTypeRepr *repr = nullptr;
+    if (components.size() == 1) {
+      repr = components.front();
+    } else {
+      repr = CompoundIdentTypeRepr::create(Context, components);
+    }
 
     // See if the repr resolves to a type.
     const auto ty = TypeResolution::resolveContextualType(
@@ -604,7 +609,12 @@ class ResolvePattern : public ASTVisitor<ResolvePattern,
 
       // Otherwise, see whether we had an enum type as the penultimate
       // component, and look up an element inside it.
-      auto *prefixRepr = IdentTypeRepr::create(Context, components);
+      IdentTypeRepr *prefixRepr = nullptr;
+      if (components.size() == 1) {
+        prefixRepr = components.front();
+      } else {
+        prefixRepr = CompoundIdentTypeRepr::create(Context, components);
+      }
 
       // See first if the entire repr resolves to a type.
       const Type enumTy = TypeResolution::resolveContextualType(