[NFC] SubscriptDecl: Strip factory constructors out of TypeLocs

Author: AnthonyLatsis

include/swift/AST/Decl.h

@@ -5611,15 +5611,15 @@ class SubscriptDecl : public GenericContext, public AbstractStorageDecl {
   SubscriptDecl(DeclName Name,
                 SourceLoc StaticLoc, StaticSpellingKind StaticSpelling,
                 SourceLoc SubscriptLoc, ParameterList *Indices,
-                SourceLoc ArrowLoc, TypeLoc ElementTy, DeclContext *Parent,
+                SourceLoc ArrowLoc, TypeRepr *ElementTyR, DeclContext *Parent,
                 GenericParamList *GenericParams)
     : GenericContext(DeclContextKind::SubscriptDecl, Parent, GenericParams),
       AbstractStorageDecl(DeclKind::Subscript,
                           StaticSpelling != StaticSpellingKind::None,
                           Parent, Name, SubscriptLoc,
                           /*will be overwritten*/ StorageIsNotMutable),
       StaticLoc(StaticLoc), ArrowLoc(ArrowLoc),
-      Indices(nullptr), ElementTy(ElementTy) {
+      Indices(nullptr), ElementTy(ElementTyR) {
     Bits.SubscriptDecl.StaticSpelling = static_cast<unsigned>(StaticSpelling);
     setIndices(Indices);
   }
@@ -5635,7 +5635,7 @@ class SubscriptDecl : public GenericContext, public AbstractStorageDecl {
                                SourceLoc StaticLoc,
                                StaticSpellingKind StaticSpelling,
                                SourceLoc SubscriptLoc, ParameterList *Indices,
-                               SourceLoc ArrowLoc, TypeLoc ElementTy,
+                               SourceLoc ArrowLoc, TypeRepr *ElementTyR,
                                DeclContext *Parent,
                                GenericParamList *GenericParams);
 

lib/AST/Decl.cpp

@@ -6597,7 +6597,7 @@ SubscriptDecl::createDeserialized(ASTContext &Context, DeclName Name,
   assert(ElementTy && "Deserialized element type must not be null");
   auto *const SD = new (Context)
       SubscriptDecl(Name, SourceLoc(), StaticSpelling, SourceLoc(), nullptr,
-                    SourceLoc(), TypeLoc(), Parent, GenericParams);
+                    SourceLoc(), /*ElementTyR=*/nullptr, Parent, GenericParams);
   SD->setElementInterfaceType(ElementTy);
   return SD;
 }
@@ -6607,11 +6607,12 @@ SubscriptDecl *SubscriptDecl::create(ASTContext &Context, DeclName Name,
                                      StaticSpellingKind StaticSpelling,
                                      SourceLoc SubscriptLoc,
                                      ParameterList *Indices, SourceLoc ArrowLoc,
-                                     TypeLoc ElementTy, DeclContext *Parent,
+                                     TypeRepr *ElementTyR, DeclContext *Parent,
                                      GenericParamList *GenericParams) {
+  assert(ElementTyR);
   auto *const SD = new (Context)
       SubscriptDecl(Name, StaticLoc, StaticSpelling, SubscriptLoc, Indices,
-                    ArrowLoc, ElementTy, Parent, GenericParams);
+                    ArrowLoc, ElementTyR, Parent, GenericParams);
   return SD;
 }
 
@@ -6627,7 +6628,7 @@ SubscriptDecl *SubscriptDecl::createImported(ASTContext &Context, DeclName Name,
 
   auto *const SD = ::new (DeclPtr)
       SubscriptDecl(Name, SourceLoc(), StaticSpellingKind::None, SubscriptLoc,
-                    Indices, ArrowLoc, TypeLoc(), Parent,
+                    Indices, ArrowLoc, /*ElementTyR=*/nullptr, Parent,
                     /*GenericParams=*/nullptr);
   SD->setElementInterfaceType(ElementTy);
   SD->setClangNode(ClangN);