IRGen: Make bindArchetype() a static helper in GenExistential.cpp to discourage future use

Author: slavapestov

lib/IRGen/GenArchetype.cpp

@@ -363,51 +363,6 @@ const TypeInfo *TypeConverter::convertArchetypeType(ArchetypeType *archetype) {
   return OpaqueArchetypeTypeInfo::create(storageType, abiAccessible);
 }
 
-static void setMetadataRef(IRGenFunction &IGF,
-                           ArchetypeType *archetype,
-                           llvm::Value *metadata,
-                           MetadataState metadataState) {
-  assert(metadata->getType() == IGF.IGM.TypeMetadataPtrTy);
-  IGF.setUnscopedLocalTypeMetadata(CanType(archetype),
-                         MetadataResponse::forBounded(metadata, metadataState));
-}
-
-static void setWitnessTable(IRGenFunction &IGF,
-                            ArchetypeType *archetype,
-                            unsigned protocolIndex,
-                            llvm::Value *wtable) {
-  assert(wtable->getType() == IGF.IGM.WitnessTablePtrTy);
-  assert(protocolIndex < archetype->getConformsTo().size());
-  auto protocol = archetype->getConformsTo()[protocolIndex];
-  IGF.setUnscopedLocalTypeData(CanType(archetype),
-                  LocalTypeDataKind::forAbstractProtocolWitnessTable(protocol),
-                               wtable);
-}
-
-/// Inform IRGenFunction that the given archetype has the given value
-/// witness value within this scope.
-void IRGenFunction::bindArchetype(ArchetypeType *archetype,
-                                  llvm::Value *metadata,
-                                  MetadataState metadataState,
-                                  ArrayRef<llvm::Value*> wtables) {
-  // Set the metadata pointer.
-  setTypeMetadataName(IGM, metadata, CanType(archetype));
-  setMetadataRef(*this, archetype, metadata, metadataState);
-
-  // Set the protocol witness tables.
-
-  unsigned wtableI = 0;
-  for (unsigned i = 0, e = archetype->getConformsTo().size(); i != e; ++i) {
-    auto proto = archetype->getConformsTo()[i];
-    if (!Lowering::TypeConverter::protocolRequiresWitnessTable(proto))
-      continue;
-    auto wtable = wtables[wtableI++];
-    setProtocolWitnessTableName(IGM, wtable, CanType(archetype), proto);
-    setWitnessTable(*this, archetype, i, wtable);
-  }
-  assert(wtableI == wtables.size());
-}
-
 llvm::Value *irgen::emitDynamicTypeOfOpaqueArchetype(IRGenFunction &IGF,
                                                      Address addr,
                                                      SILType type) {

lib/IRGen/GenExistential.cpp

@@ -1688,6 +1688,52 @@ TypeConverter::convertExistentialMetatypeType(ExistentialMetatypeType *T) {
                                              baseTI);
 }
 
+static void setMetadataRef(IRGenFunction &IGF,
+                           ArchetypeType *archetype,
+                           llvm::Value *metadata,
+                           MetadataState metadataState) {
+  assert(metadata->getType() == IGF.IGM.TypeMetadataPtrTy);
+  IGF.setUnscopedLocalTypeMetadata(CanType(archetype),
+                         MetadataResponse::forBounded(metadata, metadataState));
+}
+
+static void setWitnessTable(IRGenFunction &IGF,
+                            ArchetypeType *archetype,
+                            unsigned protocolIndex,
+                            llvm::Value *wtable) {
+  assert(wtable->getType() == IGF.IGM.WitnessTablePtrTy);
+  assert(protocolIndex < archetype->getConformsTo().size());
+  auto protocol = archetype->getConformsTo()[protocolIndex];
+  IGF.setUnscopedLocalTypeData(CanType(archetype),
+                  LocalTypeDataKind::forAbstractProtocolWitnessTable(protocol),
+                               wtable);
+}
+
+/// Inform IRGenFunction that the given archetype has the given value
+/// witness value within this scope.
+static void bindArchetype(IRGenFunction &IGF,
+                          ArchetypeType *archetype,
+                          llvm::Value *metadata,
+                          MetadataState metadataState,
+                          ArrayRef<llvm::Value*> wtables) {
+  // Set the metadata pointer.
+  setTypeMetadataName(IGF.IGM, metadata, CanType(archetype));
+  setMetadataRef(IGF, archetype, metadata, metadataState);
+
+  // Set the protocol witness tables.
+
+  unsigned wtableI = 0;
+  for (unsigned i = 0, e = archetype->getConformsTo().size(); i != e; ++i) {
+    auto proto = archetype->getConformsTo()[i];
+    if (!Lowering::TypeConverter::protocolRequiresWitnessTable(proto))
+      continue;
+    auto wtable = wtables[wtableI++];
+    setProtocolWitnessTableName(IGF.IGM, wtable, CanType(archetype), proto);
+    setWitnessTable(IGF, archetype, i, wtable);
+  }
+  assert(wtableI == wtables.size());
+}
+
 /// Emit protocol witness table pointers for the given protocol conformances,
 /// passing each emitted witness table index into the given function body.
 static void forEachProtocolWitnessTable(
@@ -1766,8 +1812,8 @@ Address irgen::emitOpenExistentialBox(IRGenFunction &IGF,
                                                  2 * IGF.IGM.getPointerSize());
   auto witness = IGF.Builder.CreateLoad(witnessAddr);
 
-  IGF.bindArchetype(openedArchetype, metadata, MetadataState::Complete,
-                    witness);
+  bindArchetype(IGF, openedArchetype, metadata, MetadataState::Complete,
+                witness);
   return box.getAddress();
 }
 
@@ -2093,8 +2139,8 @@ irgen::emitClassExistentialProjection(IRGenFunction &IGF,
                                               baseTy,
                                               sigFn,
                                               /*allow artificial*/ false);
-  IGF.bindArchetype(openedArchetype, metadata, MetadataState::Complete,
-                    wtables);
+  bindArchetype(IGF, openedArchetype, metadata, MetadataState::Complete,
+                wtables);
 
   return value;
 }
@@ -2143,8 +2189,8 @@ irgen::emitExistentialMetatypeProjection(IRGenFunction &IGF,
   }
 
   auto openedArchetype = cast<ArchetypeType>(targetType.getInstanceType());
-  IGF.bindArchetype(openedArchetype, metatype, MetadataState::Complete,
-                    wtables);
+  bindArchetype(IGF, openedArchetype, metatype, MetadataState::Complete,
+                wtables);
 
   return value;
 }
@@ -2484,8 +2530,8 @@ Address irgen::emitOpaqueBoxedExistentialProjection(
         wtables.push_back(IGF.Builder.CreateLoad(wtableAddr));
       }
 
-      IGF.bindArchetype(openedArchetype, metadata, MetadataState::Complete,
-                        wtables);
+      bindArchetype(IGF, openedArchetype, metadata, MetadataState::Complete,
+                    wtables);
     }
 
     return valueAddr;
@@ -2503,8 +2549,8 @@ Address irgen::emitOpaqueBoxedExistentialProjection(
     for (unsigned i = 0, n = layout.getNumTables(); i != n; ++i) {
       wtables.push_back(layout.loadWitnessTable(IGF, base, i));
     }
-    IGF.bindArchetype(openedArchetype, metadata, MetadataState::Complete,
-                      wtables);
+    bindArchetype(IGF, openedArchetype, metadata, MetadataState::Complete,
+                  wtables);
   }
 
   auto *projectFunc =

lib/IRGen/IRGenFunction.h

@@ -561,14 +561,6 @@ class IRGenFunction {
 public:
   void emitFakeExplosion(const TypeInfo &type, Explosion &explosion);
 
-//--- Declaration emission -----------------------------------------------------
-public:
-
-  void bindArchetype(ArchetypeType *type,
-                     llvm::Value *metadata,
-                     MetadataState metadataState,
-                     ArrayRef<llvm::Value*> wtables);
-
 //--- Type emission ------------------------------------------------------------
 public:
   /// Look up a local type metadata reference, returning a null response