[NFC] AST: Remove IdentTypeRepr::ComponentRange

AnthonyLatsis · AnthonyLatsis · commit 2113e175f5e3 · 2023-01-07T07:11:30.000+03:00
diff --git a/include/swift/AST/TypeRepr.h b/include/swift/AST/TypeRepr.h
@@ -256,8 +256,14 @@ class IdentTypeRepr : public TypeRepr {
   explicit IdentTypeRepr(TypeReprKind K) : TypeRepr(K) {}
 
 public:
-  class ComponentRange;
-  inline ComponentRange getComponentRange();
+  TypeRepr *getBaseComponent();
+  ComponentIdentTypeRepr *getLastComponent();
+
+  /// The type declaration the last component is bound to.
+  TypeDecl *getBoundDecl() const;
+
+  /// The identifier that describes the last component.
+  DeclNameRef getNameRef() const;
 
   static bool classof(const TypeRepr *T) {
     return T->getKind() == TypeReprKind::SimpleIdent  ||
@@ -444,38 +450,6 @@ class CompoundIdentTypeRepr final : public IdentTypeRepr,
   friend class TypeRepr;
 };
 
-/// This wraps an IdentTypeRepr and provides an iterator interface for the
-/// components (or the single component) it represents.
-class IdentTypeRepr::ComponentRange {
-  IdentTypeRepr *IdT;
-
-public:
-  explicit ComponentRange(IdentTypeRepr *T) : IdT(T) {}
-
-  typedef ComponentIdentTypeRepr * const* iterator;
-
-  iterator begin() const {
-    if (isa<ComponentIdentTypeRepr>(IdT))
-      return reinterpret_cast<iterator>(&IdT);
-    return cast<CompoundIdentTypeRepr>(IdT)->getComponents().begin();
-  }
-
-  iterator end() const {
-    if (isa<ComponentIdentTypeRepr>(IdT))
-      return reinterpret_cast<iterator>(&IdT) + 1;
-    return cast<CompoundIdentTypeRepr>(IdT)->getComponents().end();
-  }
-
-  bool empty() const { return begin() == end(); }
-
-  ComponentIdentTypeRepr *front() const { return *begin(); }
-  ComponentIdentTypeRepr *back() const { return *(end()-1); }
-};
-
-inline IdentTypeRepr::ComponentRange IdentTypeRepr::getComponentRange() {
-  return ComponentRange(this);
-}
-
 /// A function type.
 /// \code
 ///   (Foo) -> Bar
diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp
@@ -3115,7 +3115,15 @@ class PrintTypeRepr : public TypeReprVisitor<PrintTypeRepr> {
   void visitIdentTypeRepr(IdentTypeRepr *T) {
     printCommon("type_ident");
     Indent += 2;
-    for (auto comp : T->getComponentRange()) {
+
+    ArrayRef<ComponentIdentTypeRepr *> components;
+    if (auto *comp = dyn_cast<ComponentIdentTypeRepr>(T)) {
+      components = comp;
+    } else {
+      components = cast<CompoundIdentTypeRepr>(T)->getComponents();
+    }
+
+    for (auto comp : components) {
       OS << '\n';
       printCommon("component");
       PrintWithColorRAII(OS, IdentifierColor)
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
@@ -2236,8 +2236,12 @@ TypeExpr *TypeExpr::createForMemberDecl(IdentTypeRepr *ParentTR,
 
   // Create a new list of components.
   SmallVector<ComponentIdentTypeRepr *, 2> Components;
-  for (auto *Component : ParentTR->getComponentRange())
-    Components.push_back(Component);
+  if (auto *Comp = dyn_cast<ComponentIdentTypeRepr>(ParentTR)) {
+    Components.push_back(Comp);
+  } else {
+    auto OldComps = cast<CompoundIdentTypeRepr>(ParentTR)->getComponents();
+    Components.append(OldComps.begin(), OldComps.end());
+  }
 
   assert(!Components.empty());
 
@@ -2256,8 +2260,11 @@ TypeExpr *TypeExpr::createForSpecializedDecl(IdentTypeRepr *ParentTR,
                                              ASTContext &C) {
   // Create a new list of components.
   SmallVector<ComponentIdentTypeRepr *, 2> components;
-  for (auto *component : ParentTR->getComponentRange()) {
-    components.push_back(component);
+  if (auto *comp = dyn_cast<ComponentIdentTypeRepr>(ParentTR)) {
+    components.push_back(comp);
+  } else {
+    auto oldComps = cast<CompoundIdentTypeRepr>(ParentTR)->getComponents();
+    components.append(oldComps.begin(), oldComps.end());
   }
 
   auto *last = components.back();
diff --git a/lib/AST/NameLookup.cpp b/lib/AST/NameLookup.cpp
@@ -2425,7 +2425,14 @@ directReferencesForIdentTypeRepr(Evaluator &evaluator,
                                  DeclContext *dc, bool allowUsableFromInline) {
   DirectlyReferencedTypeDecls current;
 
-  for (const auto &component : ident->getComponentRange()) {
+  ArrayRef<ComponentIdentTypeRepr *> components;
+  if (auto *comp = dyn_cast<ComponentIdentTypeRepr>(ident)) {
+    components = comp;
+  } else {
+    components = cast<CompoundIdentTypeRepr>(ident)->getComponents();
+  }
+
+  for (const auto &component : components) {
     // If we already set a declaration, use it.
     if (auto typeDecl = component->getBoundDecl()) {
       current = {1, typeDecl};
diff --git a/lib/AST/TypeRepr.cpp b/lib/AST/TypeRepr.cpp
@@ -127,6 +127,28 @@ SourceLoc TypeRepr::findUncheckedAttrLoc() const {
   return SourceLoc();
 }
 
+TypeDecl *IdentTypeRepr::getBoundDecl() const {
+  return const_cast<IdentTypeRepr *>(this)->getLastComponent()->getBoundDecl();
+}
+
+DeclNameRef IdentTypeRepr::getNameRef() const {
+  return const_cast<IdentTypeRepr *>(this)->getLastComponent()->getNameRef();
+}
+
+TypeRepr *IdentTypeRepr::getBaseComponent() {
+  if (auto *Comp = dyn_cast<ComponentIdentTypeRepr>(this))
+    return Comp;
+
+  return cast<CompoundIdentTypeRepr>(this)->getComponents().front();
+}
+
+ComponentIdentTypeRepr *IdentTypeRepr::getLastComponent() {
+  if (auto *Comp = dyn_cast<ComponentIdentTypeRepr>(this))
+    return Comp;
+
+  return cast<CompoundIdentTypeRepr>(this)->getComponents().back();
+}
+
 DeclNameRef ComponentIdentTypeRepr::getNameRef() const {
   if (IdOrDecl.is<DeclNameRef>())
     return IdOrDecl.get<DeclNameRef>();
diff --git a/lib/IDE/CodeCompletion.cpp b/lib/IDE/CodeCompletion.cpp
@@ -215,12 +215,11 @@ class CodeCompletionCallbacksImpl : public IDEInspectionCallbacks {
 
     // It doesn't type check as a type, so see if it's a qualifying module name.
     if (auto *ITR = dyn_cast<IdentTypeRepr>(ParsedTypeLoc.getTypeRepr())) {
-      const auto &componentRange = ITR->getComponentRange();
       // If it has more than one component, it can't be a module name.
-      if (std::distance(componentRange.begin(), componentRange.end()) != 1)
+      if (isa<CompoundIdentTypeRepr>(ITR))
         return false;
 
-      const auto &component = componentRange.front();
+      const auto *component = cast<ComponentIdentTypeRepr>(ITR);
       ImportPath::Module::Builder builder(
           component->getNameRef().getBaseIdentifier(),
           component->getLoc());
diff --git a/lib/Index/Index.cpp b/lib/Index/Index.cpp
@@ -1326,11 +1326,10 @@ bool IndexSwiftASTWalker::reportInheritedTypeRefs(ArrayRef<InheritedEntry> Inher
 bool IndexSwiftASTWalker::reportRelatedTypeRef(const TypeLoc &Ty, SymbolRoleSet Relations, Decl *Related) {
 
   if (auto *T = dyn_cast_or_null<IdentTypeRepr>(Ty.getTypeRepr())) {
-    auto Comps = T->getComponentRange();
-    SourceLoc IdLoc = Comps.back()->getLoc();
+    SourceLoc IdLoc = T->getLoc();
     NominalTypeDecl *NTD = nullptr;
     bool isImplicit = false;
-    if (auto *VD = Comps.back()->getBoundDecl()) {
+    if (auto *VD = T->getBoundDecl()) {
       if (auto *TAD = dyn_cast<TypeAliasDecl>(VD)) {
         IndexSymbol Info;
         if (!reportRef(TAD, IdLoc, Info, None))
@@ -1426,8 +1425,7 @@ IndexSwiftASTWalker::getTypeLocAsNominalTypeDecl(const TypeLoc &Ty) {
   if (Type T = Ty.getType())
     return T->getAnyNominal();
   if (auto *T = dyn_cast_or_null<IdentTypeRepr>(Ty.getTypeRepr())) {
-    auto Comp = T->getComponentRange().back();
-    if (auto NTD = dyn_cast_or_null<NominalTypeDecl>(Comp->getBoundDecl()))
+    if (auto NTD = dyn_cast_or_null<NominalTypeDecl>(T->getBoundDecl()))
       return NTD;
   }
   return nullptr;
diff --git a/lib/Sema/ConstraintSystem.cpp b/lib/Sema/ConstraintSystem.cpp
@@ -1933,12 +1933,8 @@ static bool isMainDispatchQueueMember(ConstraintLocator *locator) {
   if (!identTypeRepr)
     return false;
 
-  auto components = identTypeRepr->getComponentRange();
-  if (components.empty())
-    return false;
-
-  if (components.back()->getNameRef().getBaseName().userFacingName() !=
-        "DispatchQueue")
+  if (identTypeRepr->getNameRef().getBaseName().userFacingName() !=
+      "DispatchQueue")
     return false;
 
   return true;
diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp
@@ -2375,8 +2375,7 @@ NeverNullType TypeResolver::resolveType(TypeRepr *repr,
       // be proper name lookup, OF COURSE.
       if (auto simpleIdent = dyn_cast<SimpleIdentTypeRepr>(
               opaqueRepr->getBase())) {
-        Identifier name = simpleIdent->getComponentRange().front()
-            ->getNameRef().getBaseIdentifier();
+        Identifier name = simpleIdent->getNameRef().getBaseIdentifier();
         if (auto gpDecl = opaqueRepr->getGenericParams()
                 ->lookUpGenericParam(name)) {
           auto outerGenericSignature = opaqueDecl->getNamingDecl()
@@ -3860,9 +3859,13 @@ bool TypeResolver::resolveSILResults(TypeRepr *repr,
 NeverNullType
 TypeResolver::resolveIdentifierType(IdentTypeRepr *IdType,
                                     TypeResolutionOptions options) {
-  auto ComponentRange = IdType->getComponentRange();
-  auto Components = llvm::makeArrayRef(ComponentRange.begin(),
-                                       ComponentRange.end());
+  ArrayRef<ComponentIdentTypeRepr *> Components;
+  if (auto *comp = dyn_cast<ComponentIdentTypeRepr>(IdType)) {
+    Components = comp;
+  } else {
+    Components = cast<CompoundIdentTypeRepr>(IdType)->getComponents();
+  }
+
   Type result = resolveIdentTypeComponent(resolution.withOptions(options),
                                           genericParams, Components);
   if (!result || result->hasError()) {
@@ -4714,7 +4717,7 @@ class ExistentialTypeVisitor
     if (auto compound = dyn_cast<CompoundIdentTypeRepr>(T)) {
       // Only visit the last component to check, because nested typealiases in
       // existentials are okay.
-      visit(compound->getComponentRange().back());
+      visit(compound->getComponents().back());
       return Action::SkipChildren();
     }
     // Arbitrary protocol constraints are OK on opaque types.
@@ -4795,7 +4798,7 @@ class ExistentialTypeVisitor
     }
   }
 
-  void visitIdentTypeRepr(IdentTypeRepr *T) {
+  void visitComponentIdentTypeRepr(ComponentIdentTypeRepr *T) {
     if (T->isInvalid())
       return;
 
@@ -4830,17 +4833,17 @@ class ExistentialTypeVisitor
     if (needsParens)
       OS << ")";
 
-    auto comp = T->getComponentRange().back();
-    if (auto *proto = dyn_cast_or_null<ProtocolDecl>(comp->getBoundDecl())) {
+    if (auto *proto = dyn_cast_or_null<ProtocolDecl>(T->getBoundDecl())) {
       if (proto->existentialRequiresAny() && !Ctx.LangOpts.hasFeature(Feature::ImplicitSome)) {
-        Ctx.Diags.diagnose(comp->getNameLoc(),
+        Ctx.Diags.diagnose(T->getNameLoc(),
                            diag::existential_requires_any,
                            proto->getDeclaredInterfaceType(),
                            proto->getDeclaredExistentialType(),
                            /*isAlias=*/false)
             .fixItReplace(replaceRepr->getSourceRange(), fix);
       }
-    } else if (auto *alias = dyn_cast_or_null<TypeAliasDecl>(comp->getBoundDecl())) {
+    } else if (auto *alias =
+                   dyn_cast_or_null<TypeAliasDecl>(T->getBoundDecl())) {
       auto type = Type(alias->getDeclaredInterfaceType()->getDesugaredType());
 
       // If this is a type alias to a constraint type, the type
@@ -4852,7 +4855,7 @@ class ExistentialTypeVisitor
           if (!protoDecl->existentialRequiresAny() || Ctx.LangOpts.hasFeature(Feature::ImplicitSome))
             continue;
 
-          Ctx.Diags.diagnose(comp->getNameLoc(),
+          Ctx.Diags.diagnose(T->getNameLoc(),
                              diag::existential_requires_any,
                              alias->getDeclaredInterfaceType(),
                              ExistentialType::get(alias->getDeclaredInterfaceType()),
diff --git a/lib/Sema/TypeChecker.cpp b/lib/Sema/TypeChecker.cpp
@@ -475,10 +475,12 @@ namespace {
 
     PreWalkAction walkToTypeReprPre(TypeRepr *T) override {
       if (auto *ident = dyn_cast<IdentTypeRepr>(T)) {
-        auto firstComponent = ident->getComponentRange().front();
-        auto name = firstComponent->getNameRef().getBaseIdentifier();
+      if (auto *base =
+              dyn_cast<ComponentIdentTypeRepr>(ident->getBaseComponent())) {
+        auto name = base->getNameRef().getBaseIdentifier();
         if (auto *paramDecl = params->lookUpGenericParam(name))
-          firstComponent->setValue(paramDecl, dc);
+          base->setValue(paramDecl, dc);
+      }
       }
 
       return Action::Continue();
