Minor simplifications suggested by Slava

Author: DougGregor

lib/SIL/SILFunctionType.cpp

@@ -869,9 +869,6 @@ static CanSILFunctionType getSILFunctionType(SILModule &M,
     // signature from the AST for that.
     auto origGenericSig
       = function->getGenericSignature();
-    auto getCanonicalType = [origGenericSig, &M](Type t) -> CanType {
-      return t->getCanonicalType(origGenericSig);
-    };
 
     auto &Types = M.Types;
     auto loweredCaptures = Types.getLoweredLocalCaptures(*function);
@@ -887,7 +884,8 @@ static CanSILFunctionType getSILFunctionType(SILModule &M,
             dynamicSelfInterfaceType,
             MetatypeRepresentation::Thick);
 
-        auto canSelfMetatype = getCanonicalType(selfMetatype);
+        auto canSelfMetatype =
+          selfMetatype->getCanonicalType(origGenericSig);
         SILParameterInfo param(canSelfMetatype, convention);
         inputs.push_back(param);
 
@@ -896,7 +894,7 @@ static CanSILFunctionType getSILFunctionType(SILModule &M,
 
       auto *VD = capture.getDecl();
       auto type = VD->getInterfaceType();
-      auto canType = getCanonicalType(type);
+      auto canType = type->getCanonicalType(origGenericSig);
 
       auto &loweredTL = Types.getTypeLowering(
                               AbstractionPattern(genericSig, canType), canType);

lib/SILGen/SILGenPoly.cpp

@@ -2822,10 +2822,6 @@ CanSILFunctionType SILGenFunction::buildThunkType(
                       ? DefaultThickCalleeConvention
                       : ParameterConvention::Direct_Unowned});
 
-  auto getCanonicalType = [&](Type t) -> CanType {
-    return t->getCanonicalType(genericSig);
-  };
-
   // Map the parameter and expected types out of context to get the interface
   // type of the thunk.
   SmallVector<SILParameterInfo, 4> interfaceParams;
@@ -2834,15 +2830,16 @@ CanSILFunctionType SILGenFunction::buildThunkType(
     auto paramIfaceTy = GenericEnvironment::mapTypeOutOfContext(
         genericEnv, param.getType());
     interfaceParams.push_back(
-      SILParameterInfo(getCanonicalType(paramIfaceTy),
+      SILParameterInfo(paramIfaceTy->getCanonicalType(genericSig),
                        param.getConvention()));
   }
 
   SmallVector<SILResultInfo, 4> interfaceResults;
   for (auto &result : expectedType->getResults()) {
     auto resultIfaceTy = GenericEnvironment::mapTypeOutOfContext(
         genericEnv, result.getType());
-    auto interfaceResult = result.getWithType(getCanonicalType(resultIfaceTy));
+    auto interfaceResult =
+      result.getWithType(resultIfaceTy->getCanonicalType(genericSig));
     interfaceResults.push_back(interfaceResult);
   }
 
@@ -2852,7 +2849,7 @@ CanSILFunctionType SILGenFunction::buildThunkType(
     auto errorIfaceTy = GenericEnvironment::mapTypeOutOfContext(
         genericEnv, errorResult.getType());
     interfaceErrorResult = SILResultInfo(
-        getCanonicalType(errorIfaceTy),
+        errorIfaceTy->getCanonicalType(genericSig),
         expectedType->getErrorResult().getConvention());
   }