[NFC] AST: Remove BoundGeneric*Type::get forwarders

Author: AnthonyLatsis

include/swift/AST/Types.h

@@ -2262,13 +2262,6 @@ class BoundGenericClassType final : public BoundGenericType,
   friend class BoundGenericType;
 
 public:
-  static BoundGenericClassType* get(ClassDecl *theDecl, Type parent,
-                                    ArrayRef<Type> genericArgs) {
-    return cast<BoundGenericClassType>(
-             BoundGenericType::get(reinterpret_cast<NominalTypeDecl*>(theDecl),
-                                   parent, genericArgs));
-  }
-
   /// Returns the declaration that declares this type.
   ClassDecl *getDecl() const {
     return reinterpret_cast<ClassDecl*>(BoundGenericType::getDecl());
@@ -2296,13 +2289,6 @@ class BoundGenericEnumType final : public BoundGenericType,
   friend class BoundGenericType;
 
 public:
-  static BoundGenericEnumType* get(EnumDecl *theDecl, Type parent,
-                                    ArrayRef<Type> genericArgs) {
-    return cast<BoundGenericEnumType>(
-             BoundGenericType::get(reinterpret_cast<NominalTypeDecl*>(theDecl),
-                                   parent, genericArgs));
-  }
-
   /// Returns the declaration that declares this type.
   EnumDecl *getDecl() const {
     return reinterpret_cast<EnumDecl*>(BoundGenericType::getDecl());
@@ -2330,13 +2316,6 @@ class BoundGenericStructType final : public BoundGenericType,
   friend class BoundGenericType;
 
 public:
-  static BoundGenericStructType* get(StructDecl *theDecl, Type parent,
-                                    ArrayRef<Type> genericArgs) {
-    return cast<BoundGenericStructType>(
-             BoundGenericType::get(reinterpret_cast<NominalTypeDecl*>(theDecl),
-                                   parent, genericArgs));
-  }
-
   /// Returns the declaration that declares this type.
   StructDecl *getDecl() const {
     return reinterpret_cast<StructDecl*>(BoundGenericType::getDecl());

lib/AST/ASTDemangler.cpp

@@ -693,8 +693,7 @@ Type ASTBuilder::createBoundGenericObjCClassType(StringRef name,
     parent = dc->getDeclaredInterfaceType();
   }
 
-  return BoundGenericClassType::get(cast<ClassDecl>(typeDecl),
-                                    parent, args);
+  return BoundGenericType::get(cast<ClassDecl>(typeDecl), parent, args);
 }
 
 ProtocolDecl *ASTBuilder::createObjCProtocolDecl(StringRef name) {

lib/AST/Builtins.cpp

@@ -1331,7 +1331,7 @@ static ValueDecl *getConvertUnownedUnsafeToGuaranteed(ASTContext &ctx,
 
 static ValueDecl *getPoundAssert(ASTContext &Context, Identifier Id) {
   auto int1Type = BuiltinIntegerType::get(1, Context);
-  auto optionalRawPointerType = BoundGenericEnumType::get(
+  auto optionalRawPointerType = BoundGenericType::get(
       Context.getOptionalDecl(), Type(), {Context.TheRawPointerType});
   return getBuiltinFunction(Id, {int1Type, optionalRawPointerType},
                             Context.TheEmptyTupleType);

lib/ClangImporter/ImportType.cpp

@@ -973,7 +973,7 @@ namespace {
             }
           }
           assert(importedTypeArgs.size() == typeParamCount);
-          importedType = BoundGenericClassType::get(
+          importedType = BoundGenericType::get(
             imported, nullptr, importedTypeArgs);
         } else {
           importedType = imported->getDeclaredType();

lib/IRGen/MetadataRequest.cpp

@@ -2915,7 +2915,7 @@ class EmitTypeMetadataRefForLayout
         return ty;
       auto &C = ty->getASTContext();
       auto optDecl = C.getOptionalDecl();
-      return CanType(BoundGenericEnumType::get(optDecl, Type(), payloadTy));
+      return CanType(BoundGenericType::get(optDecl, Type(), payloadTy));
     }
 
     // Otherwise, generic arguments are not lowered.

lib/SIL/IR/SILType.cpp

@@ -71,8 +71,8 @@ SILType SILType::getBuiltinWordType(const ASTContext &C) {
 
 SILType SILType::getOptionalType(SILType type) {
   auto &ctx = type.getASTContext();
-  auto optType = BoundGenericEnumType::get(ctx.getOptionalDecl(), Type(),
-                                           { type.getASTType() });
+  auto optType = BoundGenericType::get(ctx.getOptionalDecl(), Type(),
+                                       { type.getASTType() });
   return getPrimitiveType(CanType(optType), type.getCategory());
 }
 

lib/SIL/IR/TypeLowering.cpp

@@ -1674,7 +1674,7 @@ static CanType computeLoweredOptionalType(TypeConverter &tc,
   }
 
   auto optDecl = tc.Context.getOptionalDecl();
-  return CanType(BoundGenericEnumType::get(optDecl, Type(), loweredObjectType));
+  return CanType(BoundGenericType::get(optDecl, Type(), loweredObjectType));
 }
 
 static CanType