Merge pull request #62585 from adrian-prantl/constructors

Disambiguate constructors for type metadata (NFC)

Author: swift-ci

lib/IRGen/DebugTypeInfo.cpp

@@ -76,8 +76,9 @@ DebugTypeInfo DebugTypeInfo::getLocalVariable(VarDecl *Decl, swift::Type Ty,
   return getFromTypeInfo(Type, Info, IsFragmentTypeInfo);
 }
 
-DebugTypeInfo DebugTypeInfo::getMetadata(swift::Type Ty, llvm::Type *StorageTy,
-                                         Size size, Alignment align) {
+DebugTypeInfo DebugTypeInfo::getGlobalMetadata(swift::Type Ty,
+                                               llvm::Type *StorageTy, Size size,
+                                               Alignment align) {
   DebugTypeInfo DbgTy(Ty.getPointer(), StorageTy, size,
                       align, true, false, false);
   assert(StorageTy && "StorageType is a nullptr");
@@ -86,8 +87,9 @@ DebugTypeInfo DebugTypeInfo::getMetadata(swift::Type Ty, llvm::Type *StorageTy,
   return DbgTy;
 }
 
-DebugTypeInfo DebugTypeInfo::getArchetype(swift::Type Ty, llvm::Type *StorageTy,
-                                          Size size, Alignment align) {
+DebugTypeInfo DebugTypeInfo::getTypeMetadata(swift::Type Ty,
+                                             llvm::Type *StorageTy, Size size,
+                                             Alignment align) {
   DebugTypeInfo DbgTy(Ty.getPointer(), StorageTy, size,
                       align, true, true, false);
   assert(StorageTy && "StorageType is a nullptr");

lib/IRGen/DebugTypeInfo.h

@@ -61,11 +61,11 @@ class DebugTypeInfo {
                                         const TypeInfo &Info,
                                         bool IsFragmentTypeInfo);
   /// Create type for global type metadata.
-  static DebugTypeInfo getMetadata(swift::Type Ty, llvm::Type *StorageTy,
-                                   Size size, Alignment align);
+  static DebugTypeInfo getGlobalMetadata(swift::Type Ty, llvm::Type *StorageTy,
+                                         Size size, Alignment align);
   /// Create type for an artificial metadata variable.
-  static DebugTypeInfo getArchetype(swift::Type Ty, llvm::Type *StorageTy,
-                                    Size size, Alignment align);
+  static DebugTypeInfo getTypeMetadata(swift::Type Ty, llvm::Type *StorageTy,
+                                       Size size, Alignment align);
 
   /// Create a forward declaration for a type whose size is unknown.
   static DebugTypeInfo getForwardDecl(swift::Type Ty);

lib/IRGen/GenDecl.cpp

@@ -4798,9 +4798,10 @@ llvm::GlobalValue *IRGenModule::defineTypeMetadata(
                 : LinkEntity::forTypeMetadata(
                       concreteType, TypeMetadataAddress::FullMetadata));
 
-  auto DbgTy = DebugTypeInfo::getMetadata(MetatypeType::get(concreteType),
-    entity.getDefaultDeclarationType(*this)->getPointerTo(),
-    Size(0), Alignment(1));
+  auto DbgTy = DebugTypeInfo::getGlobalMetadata(
+      MetatypeType::get(concreteType),
+      entity.getDefaultDeclarationType(*this)->getPointerTo(), Size(0),
+      Alignment(1));
 
   // Define the variable.
   llvm::GlobalVariable *var = cast<llvm::GlobalVariable>(
@@ -4942,9 +4943,9 @@ IRGenModule::getAddrOfTypeMetadata(CanType concreteType,
         LinkEntity::forNoncanonicalSpecializedGenericTypeMetadata(concreteType);
     break;
   }
-  DbgTy = DebugTypeInfo::getMetadata(MetatypeType::get(concreteType),
-                                     defaultVarTy->getPointerTo(), Size(0),
-                                     Alignment(1));
+  DbgTy = DebugTypeInfo::getGlobalMetadata(MetatypeType::get(concreteType),
+                                           defaultVarTy->getPointerTo(),
+                                           Size(0), Alignment(1));
 
   ConstantReference addr;
   llvm::Type *typeOfValue = nullptr;

lib/IRGen/IRGenDebugInfo.cpp

@@ -2918,7 +2918,7 @@ void IRGenDebugInfoImpl::emitTypeMetadata(IRGenFunction &IGF,
   static const char *Tau = u8"\u03C4";
   llvm::raw_svector_ostream OS(Buf);
   OS << '$' << Tau << '_' << Depth << '_' << Index;
-  auto DbgTy = DebugTypeInfo::getArchetype(
+  auto DbgTy = DebugTypeInfo::getTypeMetadata(
       getMetadataType(Name)->getDeclaredInterfaceType().getPointer(),
       Metadata->getType(), Size(CI.getTargetInfo().getPointerWidth(0)),
       Alignment(CI.getTargetInfo().getPointerAlign(0)));