SIL: Add no-arg overload of SILFunction::getLoweredFunctionTypeInContext()

Author: slavapestov

include/swift/SIL/SILBridgingImpl.h

@@ -706,8 +706,7 @@ bool BridgedFunction::hasOwnership() const { return getFunction()->hasOwnership(
 bool BridgedFunction::hasLoweredAddresses() const { return getFunction()->getModule().useLoweredAddresses(); }
 
 BridgedCanType BridgedFunction::getLoweredFunctionTypeInContext() const {
-  auto expansion = getFunction()->getTypeExpansionContext();
-  return getFunction()->getLoweredFunctionTypeInContext(expansion);
+  return getFunction()->getLoweredFunctionTypeInContext();
 }
 
 BridgedGenericSignature BridgedFunction::getGenericSignature() const {

include/swift/SIL/SILFunction.h

@@ -572,6 +572,9 @@ class SILFunction
   CanSILFunctionType getLoweredFunctionType() const {
     return LoweredType;
   }
+
+  CanSILFunctionType getLoweredFunctionTypeInContext() const;
+
   CanSILFunctionType
   getLoweredFunctionTypeInContext(TypeExpansionContext context) const;
 

lib/SIL/IR/SILFunctionType.cpp

@@ -5291,11 +5291,15 @@ TypeExpansionContext::TypeExpansionContext(const SILFunction &f)
       inContext(f.getModule().getAssociatedContext()),
       isContextWholeModule(f.getModule().isWholeModule()) {}
 
+CanSILFunctionType SILFunction::getLoweredFunctionTypeInContext() const {
+  return getLoweredFunctionTypeInContext(getTypeExpansionContext());
+}
+
 CanSILFunctionType SILFunction::getLoweredFunctionTypeInContext(
     TypeExpansionContext context) const {
   auto origFunTy = getLoweredFunctionType();
   auto &M = getModule();
-  auto funTy = M.Types.getLoweredType(origFunTy , context);
+  auto funTy = M.Types.getLoweredType(origFunTy, context);
   return cast<SILFunctionType>(funTy.getASTType());
 }
 

lib/SILGen/SILGenApply.cpp

@@ -6499,8 +6499,7 @@ void SILGenFunction::emitYield(SILLocation loc,
   SmallVector<ManagedValue, 4> yieldArgs;
   SmallVector<DelayedArgument, 2> delayedArgs;
 
-  auto fnType = F.getLoweredFunctionTypeInContext(getTypeExpansionContext())
-    ->getUnsubstitutedType(SGM.M);
+  auto fnType = F.getLoweredFunctionTypeInContext()->getUnsubstitutedType(SGM.M);
   SmallVector<SILParameterInfo, 4> substYieldTys;
   for (auto origYield : fnType->getYields()) {
     substYieldTys.push_back(

lib/SILGen/SILGenExpr.cpp

@@ -3734,8 +3734,7 @@ static SILFunction *getOrCreateKeyPathGetter(
     thunk->setGenericEnvironment(genericEnv);
   }
   SILGenFunction subSGF(SGM, *thunk, SGM.SwiftModule);
-  signature = subSGF.F.getLoweredFunctionTypeInContext(
-      subSGF.F.getTypeExpansionContext());
+  signature = subSGF.F.getLoweredFunctionTypeInContext();
   auto resultArgTy =
       subSGF.silConv.getSILType(signature->getSingleResult(), signature,
                                 subSGF.F.getTypeExpansionContext());
@@ -3832,8 +3831,7 @@ static SILFunction *getOrCreateKeyPathSetter(
     thunk->setGenericEnvironment(genericEnv);
   }
   SILGenFunction subSGF(SGM, *thunk, SGM.SwiftModule);
-  signature = subSGF.F.getLoweredFunctionTypeInContext(
-      subSGF.F.getTypeExpansionContext());
+  signature = subSGF.F.getLoweredFunctionTypeInContext();
   auto valueArgTy =
       subSGF.silConv.getSILType(signature->getParameters()[0], signature,
                                 subSGF.getTypeExpansionContext());
@@ -3968,8 +3966,7 @@ static SILFunction *getOrCreateKeyPathAppliedMethod(
     thunk->setGenericEnvironment(genericEnv);
   }
   SILGenFunction subSGF(SGM, *thunk, SGM.SwiftModule);
-  signature = subSGF.F.getLoweredFunctionTypeInContext(
-      subSGF.F.getTypeExpansionContext());
+  signature = subSGF.F.getLoweredFunctionTypeInContext();
   auto resultArgTy =
       subSGF.silConv.getSILType(signature->getSingleResult(), signature,
                                 subSGF.F.getTypeExpansionContext());
@@ -4058,8 +4055,7 @@ static SILFunction *getOrCreateUnappliedKeypathMethod(
     thunk->setGenericEnvironment(genericEnv);
   }
   SILGenFunction subSGF(SGM, *thunk, SGM.SwiftModule);
-  signature = subSGF.F.getLoweredFunctionTypeInContext(
-      subSGF.F.getTypeExpansionContext());
+  signature = subSGF.F.getLoweredFunctionTypeInContext();
   auto resultArgTy =
       subSGF.silConv.getSILType(signature->getSingleResult(), signature,
                                 subSGF.F.getTypeExpansionContext());

lib/SILGen/SILGenProlog.cpp

@@ -92,7 +92,7 @@ struct LoweredParamGenerator {
                         unsigned numIgnoredTrailingParameters)
     : SGF(SGF), fnTy(SGF.F.getLoweredFunctionType()),
       parameterTypes(
-          SGF.F.getLoweredFunctionTypeInContext(SGF.B.getTypeExpansionContext())
+          SGF.F.getLoweredFunctionTypeInContext()
               ->getParameters().drop_back(numIgnoredTrailingParameters)) {}
 
   ParamDecl *paramDecl = nullptr;