AST: Remove PackArchetypeType::getSingletonPackType()

Author: slavapestov

include/swift/AST/Types.h

@@ -6355,8 +6355,6 @@ class PackArchetypeType final
     return T->getKind() == TypeKind::PackArchetype;
   }
 
-  CanTypeWrapper<PackType> getSingletonPackType();
-
 private:
   PackArchetypeType(const ASTContext &Ctx, GenericEnvironment *GenericEnv,
                     Type InterfaceType, ArrayRef<ProtocolDecl *> ConformsTo,
@@ -6831,6 +6829,9 @@ BEGIN_CAN_TYPE_WRAPPER(PackType, Type)
   static CanPackType get(const ASTContext &ctx, ArrayRef<CanType> elements);
   static CanPackType get(const ASTContext &ctx, CanTupleEltTypeArrayRef elts);
 
+  static CanTypeWrapper<PackType>
+  getSingletonPackExpansion(CanType packParameter);
+
   CanType getElementType(unsigned elementNo) const {
     return CanType(getPointer()->getElementType(elementNo));
   }

lib/AST/ASTContext.cpp

@@ -3293,11 +3293,6 @@ PackType *PackType::getEmpty(const ASTContext &C) {
   return cast<PackType>(CanType(C.TheEmptyPackType));
 }
 
-PackType *PackType::getSingletonPackExpansion(Type param) {
-  assert(param->isParameterPack() || param->is<PackArchetypeType>());
-  return get(param->getASTContext(), {PackExpansionType::get(param, param)});
-}
-
 CanPackType CanPackType::get(const ASTContext &C, ArrayRef<CanType> elements) {
   SmallVector<Type, 8> ncElements(elements.begin(), elements.end());
   return CanPackType(PackType::get(C, ncElements));

lib/AST/ParameterPack.cpp

@@ -460,10 +460,13 @@ PackType *PackType::get(const ASTContext &C,
   return get(C, wrappedArgs)->flattenPackTypes();
 }
 
-CanPackType PackArchetypeType::getSingletonPackType() {
-  SmallVector<Type, 1> types;
-  types.push_back(PackExpansionType::get(this, getReducedShape()));
-  return CanPackType(PackType::get(getASTContext(), types));
+PackType *PackType::getSingletonPackExpansion(Type param) {
+  assert(param->isParameterPack() || param->is<PackArchetypeType>());
+  return get(param->getASTContext(), {PackExpansionType::get(param, param)});
+}
+
+CanPackType CanPackType::getSingletonPackExpansion(CanType param) {
+  return CanPackType(PackType::getSingletonPackExpansion(param));
 }
 
 bool SILPackType::containsPackExpansionType() const {

lib/IRGen/GenPack.cpp

@@ -177,7 +177,7 @@ irgen::emitPackArchetypeMetadataRef(IRGenFunction &IGF,
   if (auto result = IGF.tryGetLocalTypeMetadata(type, request))
     return result;
 
-  auto packType = type->getSingletonPackType();
+  auto packType = CanPackType::getSingletonPackExpansion(type);
   auto response = emitTypeMetadataPackRef(IGF, packType, request);
 
   IGF.setScopedLocalTypeMetadata(type, response);