SIL: Add TypeExpansion to SIL type lowering

Author: aschwaighofer

include/swift/SIL/SILType.h

@@ -244,7 +244,7 @@ class SILType {
   /// tc.getTypeLowering(type).isAddressOnly().
   static bool isAddressOnly(CanType type, Lowering::TypeConverter &tc,
                             CanGenericSignature sig,
-                            ResilienceExpansion expansion);
+                            TypeExpansionContext expansion);
 
   /// Return true if this type must be returned indirectly.
   ///
@@ -253,7 +253,7 @@ class SILType {
   static bool isFormallyReturnedIndirectly(CanType type,
                                            Lowering::TypeConverter &tc,
                                            CanGenericSignature sig) {
-    return isAddressOnly(type, tc, sig, ResilienceExpansion::Minimal);
+    return isAddressOnly(type, tc, sig, TypeExpansionContext::minimal());
   }
 
   /// Return true if this type must be passed indirectly.
@@ -263,7 +263,7 @@ class SILType {
   static bool isFormallyPassedIndirectly(CanType type,
                                          Lowering::TypeConverter &tc,
                                          CanGenericSignature sig) {
-    return isAddressOnly(type, tc, sig, ResilienceExpansion::Minimal);
+    return isAddressOnly(type, tc, sig, TypeExpansionContext::minimal());
   }
 
   /// True if the type, or the referenced type of an address type, is loadable.
@@ -411,16 +411,20 @@ class SILType {
   /// the given field.  Applies substitutions as necessary.  The
   /// result will be an address type if the base type is an address
   /// type or a class.
-  SILType getFieldType(VarDecl *field, Lowering::TypeConverter &TC) const;
+  SILType getFieldType(VarDecl *field, Lowering::TypeConverter &TC,
+                       TypeExpansionContext context) const;
 
-  SILType getFieldType(VarDecl *field, SILModule &M) const;
+  SILType getFieldType(VarDecl *field, SILModule &M,
+                       TypeExpansionContext context) const;
 
   /// Given that this is an enum type, return the lowered type of the
   /// data for the given element.  Applies substitutions as necessary.
   /// The result will have the same value category as the base type.
-  SILType getEnumElementType(EnumElementDecl *elt, Lowering::TypeConverter &TC) const;
+  SILType getEnumElementType(EnumElementDecl *elt, Lowering::TypeConverter &TC,
+                             TypeExpansionContext context) const;
 
-  SILType getEnumElementType(EnumElementDecl *elt, SILModule &M) const;
+  SILType getEnumElementType(EnumElementDecl *elt, SILModule &M,
+                             TypeExpansionContext context) const;
 
   /// Given that this is a tuple type, return the lowered type of the
   /// given tuple element.  The result will have the same value
@@ -458,11 +462,11 @@ class SILType {
   /// generic args with the appropriate item from the substitution.
   ///
   /// Only call this with function types!
-  SILType substGenericArgs(Lowering::TypeConverter &TC,
-                           SubstitutionMap SubMap) const;
+  SILType substGenericArgs(Lowering::TypeConverter &TC, SubstitutionMap SubMap,
+                           TypeExpansionContext context) const;
 
-  SILType substGenericArgs(SILModule &M,
-                           SubstitutionMap SubMap) const;
+  SILType substGenericArgs(SILModule &M, SubstitutionMap SubMap,
+                           TypeExpansionContext context) const;
 
   /// If the original type is generic, pass the signature as genericSig.
   ///
@@ -487,8 +491,9 @@ class SILType {
   bool isHeapObjectReferenceType() const;
 
   /// Returns true if this SILType is an aggregate that contains \p Ty
-  bool aggregateContainsRecord(SILType Ty, SILModule &SILMod) const;
-  
+  bool aggregateContainsRecord(SILType Ty, SILModule &SILMod,
+                               TypeExpansionContext context) const;
+
   /// Returns true if this SILType is an aggregate with unreferenceable storage,
   /// meaning it cannot be fully destructured in SIL.
   bool aggregateHasUnreferenceableStorage() const;
@@ -515,7 +520,8 @@ class SILType {
 
   /// Returns true if this SILType could be potentially a lowering of the given
   /// formal type. Meant for verification purposes/assertions.
-  bool isLoweringOf(SILModule &M, CanType formalType);
+  bool isLoweringOf(TypeExpansionContext context, SILModule &M,
+                    CanType formalType);
 
   /// Returns the hash code for the SILType.
   llvm::hash_code getHashCode() const {
@@ -589,8 +595,9 @@ NON_SIL_TYPE(LValue)
 #undef NON_SIL_TYPE
 
 CanSILFunctionType getNativeSILFunctionType(
-    Lowering::TypeConverter &TC, Lowering::AbstractionPattern origType,
-    CanAnyFunctionType substType, Optional<SILDeclRef> origConstant = None,
+    Lowering::TypeConverter &TC, TypeExpansionContext context,
+    Lowering::AbstractionPattern origType, CanAnyFunctionType substType,
+    Optional<SILDeclRef> origConstant = None,
     Optional<SILDeclRef> constant = None,
     Optional<SubstitutionMap> reqtSubs = None,
     ProtocolConformanceRef witnessMethodConformance = ProtocolConformanceRef());
@@ -616,15 +623,15 @@ inline SILType SILField::getObjectType() const {
   return SILType::getPrimitiveObjectType(getLoweredType());
 }
 
-CanType getSILBoxFieldLoweredType(SILBoxType *type,
-                                  Lowering::TypeConverter &TC,
+CanType getSILBoxFieldLoweredType(TypeExpansionContext context,
+                                  SILBoxType *type, Lowering::TypeConverter &TC,
                                   unsigned index);
 
-inline SILType getSILBoxFieldType(SILBoxType *type,
-                                  Lowering::TypeConverter &TC,
+inline SILType getSILBoxFieldType(TypeExpansionContext context,
+                                  SILBoxType *type, Lowering::TypeConverter &TC,
                                   unsigned index) {
   return SILType::getPrimitiveAddressType(
-    getSILBoxFieldLoweredType(type, TC, index));
+      getSILBoxFieldLoweredType(context, type, TC, index));
 }
 
 } // end swift namespace