[NFC] IRGen: Store SILType in metadata collector.

Author: nate-chandler

lib/IRGen/GenExistential.cpp

@@ -253,7 +253,7 @@ namespace {
         asDerived().emitValueAssignWithCopy(IGF, destValue, srcValue);
         emitCopyOfTables(IGF, dest, src);
       } else {
-        OutliningMetadataCollector collector(IGF, LayoutIsNeeded,
+        OutliningMetadataCollector collector(T, IGF, LayoutIsNeeded,
                                              DeinitIsNotNeeded);
         collector.emitCallToOutlinedCopy(dest, src, T, *this,
                                          IsNotInitialization, IsNotTake);
@@ -268,7 +268,7 @@ namespace {
         asDerived().emitValueInitializeWithCopy(IGF, destValue, srcValue);
         emitCopyOfTables(IGF, dest, src);
       } else {
-        OutliningMetadataCollector collector(IGF, LayoutIsNeeded,
+        OutliningMetadataCollector collector(T, IGF, LayoutIsNeeded,
                                              DeinitIsNotNeeded);
         collector.emitCallToOutlinedCopy(dest, src, T, *this,
                                          IsInitialization, IsNotTake);
@@ -283,7 +283,7 @@ namespace {
         asDerived().emitValueAssignWithTake(IGF, destValue, srcValue);
         emitCopyOfTables(IGF, dest, src);
       } else {
-        OutliningMetadataCollector collector(IGF, LayoutIsNeeded,
+        OutliningMetadataCollector collector(T, IGF, LayoutIsNeeded,
                                              DeinitIsNotNeeded);
         collector.emitCallToOutlinedCopy(dest, src, T, *this,
                                          IsNotInitialization, IsTake);
@@ -298,7 +298,7 @@ namespace {
         asDerived().emitValueInitializeWithTake(IGF, destValue, srcValue);
         emitCopyOfTables(IGF, dest, src);
       } else {
-        OutliningMetadataCollector collector(IGF, LayoutIsNeeded,
+        OutliningMetadataCollector collector(T, IGF, LayoutIsNeeded,
                                              DeinitIsNotNeeded);
         collector.emitCallToOutlinedCopy(dest, src, T, *this,
                                          IsInitialization, IsTake);
@@ -311,7 +311,7 @@ namespace {
         Address valueAddr = projectValue(IGF, existential);
         asDerived().emitValueDestroy(IGF, valueAddr);
       } else {
-        OutliningMetadataCollector collector(IGF, LayoutIsNeeded,
+        OutliningMetadataCollector collector(T, IGF, LayoutIsNeeded,
                                              DeinitIsNeeded);
         collector.emitCallToOutlinedDestroy(existential, T, *this);
       }
@@ -968,7 +968,7 @@ class OpaqueExistentialTypeInfo final :
                                                srcBuffer);
     } else {
       // Create an outlined function to avoid explosion
-      OutliningMetadataCollector collector(IGF, LayoutIsNeeded,
+      OutliningMetadataCollector collector(T, IGF, LayoutIsNeeded,
                                            DeinitIsNotNeeded);
       collector.emitCallToOutlinedCopy(dest, src, T, *this,
                                        IsInitialization, IsNotTake);
@@ -985,7 +985,7 @@ class OpaqueExistentialTypeInfo final :
       IGF.emitMemCpy(dest, src, getLayout().getSize(IGF.IGM));
     } else {
       // Create an outlined function to avoid explosion
-      OutliningMetadataCollector collector(IGF, LayoutIsNeeded,
+      OutliningMetadataCollector collector(T, IGF, LayoutIsNeeded,
                                            DeinitIsNotNeeded);
       collector.emitCallToOutlinedCopy(dest, src, T, *this,
                                        IsInitialization, IsTake);

lib/IRGen/GenType.cpp

@@ -184,7 +184,7 @@ void LoadableTypeInfo::initializeWithCopy(IRGenFunction &IGF, Address destAddr,
     loadAsCopy(IGF, srcAddr, copy);
     initialize(IGF, copy, destAddr, true);
   } else {
-    OutliningMetadataCollector collector(IGF, LayoutIsNeeded,
+    OutliningMetadataCollector collector(T, IGF, LayoutIsNeeded,
                                          DeinitIsNotNeeded);
     // No need to collect anything because we assume loadable types can be
     // loaded without enums.

lib/IRGen/Outlining.cpp

@@ -33,9 +33,9 @@ using namespace swift;
 using namespace irgen;
 
 OutliningMetadataCollector::OutliningMetadataCollector(
-    IRGenFunction &IGF, LayoutIsNeeded_t needsLayout,
+    SILType T, IRGenFunction &IGF, LayoutIsNeeded_t needsLayout,
     DeinitIsNeeded_t needsDeinitTypes)
-    : IGF(IGF), needsLayout(needsLayout), needsDeinit(needsDeinitTypes) {}
+    : T(T), IGF(IGF), needsLayout(needsLayout), needsDeinit(needsDeinitTypes) {}
 
 void OutliningMetadataCollector::collectTypeMetadata(SILType ty) {
   // If the type has no archetypes, we can emit it from scratch in the callee.
@@ -180,7 +180,7 @@ bool TypeInfo::withWitnessableMetadataCollector(
   }
 
   if (needsCollector) {
-    OutliningMetadataCollector collector(IGF, needsLayout, needsDeinit);
+    OutliningMetadataCollector collector(T, IGF, needsLayout, needsDeinit);
     if (needsDeinit || needsLayout) {
       // Only collect if anything would be collected.
       collectMetadataForOutlining(collector, T);
@@ -479,7 +479,8 @@ llvm::Constant *IRGenModule::getOrCreateRetainFunction(const TypeInfo &ti,
 
 void TypeInfo::callOutlinedRelease(IRGenFunction &IGF, Address addr, SILType T,
                                    Atomicity atomicity) const {
-  OutliningMetadataCollector collector(IGF, LayoutIsNotNeeded, DeinitIsNeeded);
+  OutliningMetadataCollector collector(T, IGF, LayoutIsNotNeeded,
+                                       DeinitIsNeeded);
   collectMetadataForOutlining(collector, T);
   collector.emitCallToOutlinedRelease(addr, T, *this, atomicity);
 }

lib/IRGen/Outlining.h

@@ -20,6 +20,7 @@
 #include "IRGen.h"
 #include "LocalTypeDataKind.h"
 #include "swift/Basic/LLVM.h"
+#include "swift/SIL/SILType.h"
 #include "llvm/ADT/MapVector.h"
 
 namespace llvm {
@@ -33,6 +34,7 @@ class CanType;
 enum IsInitialization_t : bool;
 enum IsTake_t : bool;
 class SILType;
+class NominalTypeDecl;
 
 namespace irgen {
 class Address;
@@ -60,6 +62,7 @@ enum DeinitIsNeeded_t : bool {
 ///   - emit the call to the outlined copy/destroy helper
 class OutliningMetadataCollector {
 public:
+  SILType T;
   IRGenFunction &IGF;
   const unsigned needsLayout : 1;
   const unsigned needsDeinit : 1;
@@ -69,7 +72,8 @@ class OutliningMetadataCollector {
   friend class IRGenModule;
 
 public:
-  OutliningMetadataCollector(IRGenFunction &IGF, LayoutIsNeeded_t needsLayout,
+  OutliningMetadataCollector(SILType T, IRGenFunction &IGF,
+                             LayoutIsNeeded_t needsLayout,
                              DeinitIsNeeded_t needsDeinitTypes);
 
   void collectTypeMetadata(SILType type);