SIL: Add getTypeExpansionContext to SILFunction

Author: aschwaighofer

include/swift/SIL/SILFunction.h

@@ -342,6 +342,14 @@ class SILFunction
   CanSILFunctionType getLoweredFunctionType() const {
     return LoweredType;
   }
+  CanSILFunctionType
+  getLoweredFunctionTypeInContext(TypeExpansionContext context) const;
+
+  SILType getLoweredTypeInContext(TypeExpansionContext context) const {
+    return SILType::getPrimitiveObjectType(
+        getLoweredFunctionTypeInContext(context));
+  }
+
   SILFunctionConventions getConventions() const {
     return SILFunctionConventions(LoweredType, getModule());
   }
@@ -491,6 +499,11 @@ class SILFunction
             : ResilienceExpansion::Maximal);
   }
 
+  // Returns the type expansion context to be used inside this function.
+  TypeExpansionContext getTypeExpansionContext() const {
+    return TypeExpansionContext(*this);
+  }
+
   const Lowering::TypeLowering &
   getTypeLowering(Lowering::AbstractionPattern orig, Type subst);
 

lib/SIL/SILFunction.cpp

@@ -235,34 +235,34 @@ bool SILFunction::isNoReturnFunction() const {
 const TypeLowering &
 SILFunction::getTypeLowering(AbstractionPattern orig, Type subst) {
   return getModule().Types.getTypeLowering(orig, subst,
-                                           getResilienceExpansion());
+                                           TypeExpansionContext(*this));
 }
 
 const TypeLowering &SILFunction::getTypeLowering(Type t) const {
-  return getModule().Types.getTypeLowering(t, getResilienceExpansion());
+  return getModule().Types.getTypeLowering(t, TypeExpansionContext(*this));
 }
 
 SILType
 SILFunction::getLoweredType(AbstractionPattern orig, Type subst) const {
   return getModule().Types.getLoweredType(orig, subst,
-                                          getResilienceExpansion());
+                                          TypeExpansionContext(*this));
 }
 
 SILType SILFunction::getLoweredType(Type t) const {
-  return getModule().Types.getLoweredType(t, getResilienceExpansion());
+  return getModule().Types.getLoweredType(t, TypeExpansionContext(*this));
 }
 
 SILType SILFunction::getLoweredLoadableType(Type t) const {
   auto &M = getModule();
-  return M.Types.getLoweredLoadableType(t, getResilienceExpansion(), M);
+  return M.Types.getLoweredLoadableType(t, TypeExpansionContext(*this), M);
 }
 
 const TypeLowering &SILFunction::getTypeLowering(SILType type) const {
-  return getModule().Types.getTypeLowering(type, getResilienceExpansion());
+  return getModule().Types.getTypeLowering(type, TypeExpansionContext(*this));
 }
 
 bool SILFunction::isTypeABIAccessible(SILType type) const {
-  return getModule().isTypeABIAccessible(type, getResilienceExpansion());
+  return getModule().isTypeABIAccessible(type, TypeExpansionContext(*this));
 }
 
 bool SILFunction::isWeakImported() const {