SIL: Add type lowering APIs to SILFunction

For now these just forward to methods on the module's TypeLowering,
but soon they will use the SILFunction's resilience expansion.

Author: slavapestov

include/swift/SIL/SILFunction.h

@@ -38,6 +38,11 @@ class SILModule;
 class SILFunctionBuilder;
 class SILProfiler;
 
+namespace Lowering {
+class TypeLowering;
+class AbstractionPattern;
+}
+
 enum IsBare_t { IsNotBare, IsBare };
 enum IsTransparent_t { IsNotTransparent, IsTransparent };
 enum Inline_t { InlineDefault, NoInline, AlwaysInline };
@@ -464,6 +469,19 @@ class SILFunction
             : ResilienceExpansion::Maximal);
   }
 
+  const Lowering::TypeLowering &
+  getTypeLowering(Lowering::AbstractionPattern orig, Type subst);
+
+  const Lowering::TypeLowering &getTypeLowering(Type t) const;
+
+  SILType getLoweredType(Lowering::AbstractionPattern orig, Type subst) const;
+
+  SILType getLoweredType(Type t) const;
+
+  SILType getLoweredLoadableType(Type t) const;
+
+  const Lowering::TypeLowering &getTypeLowering(SILType type) const;
+
   /// Returns true if this function has a calling convention that has a self
   /// argument.
   bool hasSelfParam() const {

include/swift/SIL/TypeLowering.h

@@ -769,13 +769,16 @@ class TypeConverter {
                                ResilienceExpansion::Minimal);
 
   // Returns the lowered SIL type for a Swift type.
-  SILType getLoweredType(Type t) {
-    return getTypeLowering(t, ResilienceExpansion::Minimal).getLoweredType();
+  SILType getLoweredType(Type t, ResilienceExpansion forExpansion
+                           = ResilienceExpansion::Minimal) {
+    return getTypeLowering(t, forExpansion).getLoweredType();
   }
 
   // Returns the lowered SIL type for a Swift type.
-  SILType getLoweredType(AbstractionPattern origType, Type substType) {
-    return getTypeLowering(origType, substType, ResilienceExpansion::Minimal)
+  SILType getLoweredType(AbstractionPattern origType, Type substType,
+                         ResilienceExpansion forExpansion =
+                           ResilienceExpansion::Minimal) {
+    return getTypeLowering(origType, substType, forExpansion)
       .getLoweredType();
   }
 

lib/SIL/SILFunction.cpp

@@ -226,6 +226,43 @@ bool SILFunction::isNoReturnFunction() const {
       .isNoReturnFunction();
 }
 
+const TypeLowering &
+SILFunction::getTypeLowering(AbstractionPattern orig, Type subst) {
+  // FIXME: Expansion
+  return getModule().Types.getTypeLowering(orig, subst,
+                                            ResilienceExpansion::Minimal);
+}
+
+const TypeLowering &SILFunction::getTypeLowering(Type t) const {
+  // FIXME: Expansion
+  return getModule().Types.getTypeLowering(t, ResilienceExpansion::Minimal);
+}
+
+SILType
+SILFunction::getLoweredType(AbstractionPattern orig, Type subst) const {
+  // FIXME: Expansion
+  return getModule().Types.getLoweredType(orig, subst,
+                                          ResilienceExpansion::Minimal);
+}
+
+SILType SILFunction::getLoweredType(Type t) const {
+  // FIXME: Expansion
+  return getModule().Types.getLoweredType(t,
+                                          ResilienceExpansion::Minimal);
+}
+
+SILType SILFunction::getLoweredLoadableType(Type t) const {
+  // FIXME: Expansion
+  return getModule().Types.getLoweredLoadableType(t,
+                                                  ResilienceExpansion::Minimal);
+}
+
+const TypeLowering &SILFunction::getTypeLowering(SILType type) const {
+  // FIXME: Expansion
+  return getModule().Types.getTypeLowering(type,
+                                           ResilienceExpansion::Minimal);
+}
+
 SILBasicBlock *SILFunction::createBasicBlock() {
   return new (getModule()) SILBasicBlock(this, nullptr, false);
 }

lib/SILGen/SILGenFunction.h

@@ -495,27 +495,26 @@ class LLVM_LIBRARY_VISIBILITY SILGenFunction
   SILOptions &getOptions() { return getModule().getOptions(); }
 
   const TypeLowering &getTypeLowering(AbstractionPattern orig, Type subst) {
-    return SGM.Types.getTypeLowering(orig, subst);
+    return F.getTypeLowering(orig, subst);
   }
   const TypeLowering &getTypeLowering(Type t) {
-    return SGM.Types.getTypeLowering(t);
+    return F.getTypeLowering(t);
   }
   CanSILFunctionType getSILFunctionType(AbstractionPattern orig,
                                         CanFunctionType substFnType) {
     return SGM.Types.getSILFunctionType(orig, substFnType);
   }
   SILType getLoweredType(AbstractionPattern orig, Type subst) {
-    return SGM.Types.getLoweredType(orig, subst);
+    return F.getLoweredType(orig, subst);
   }
   SILType getLoweredType(Type t) {
-    return SGM.Types.getLoweredType(t);
+    return F.getLoweredType(t);
   }
   SILType getLoweredLoadableType(Type t) {
-    return SGM.Types.getLoweredLoadableType(t);
+    return F.getLoweredLoadableType(t);
   }
-
   const TypeLowering &getTypeLowering(SILType type) {
-    return SGM.Types.getTypeLowering(type);
+    return F.getTypeLowering(type);
   }
 
   SILType getSILType(SILParameterInfo param) const {