[SILGen] Eliminate more SubstitutionLists for accessor calls.

Author: DougGregor

lib/SILGen/SILGenConstructor.cpp

@@ -951,15 +951,15 @@ void SILGenFunction::emitMemberInitializers(DeclContext *dc,
         // signature of the type, with replacement archetypes from the
         // constructor's context (which might be in an extension of
         // the type, which adds additional generic requirements).
-        SubstitutionList subs;
+        SubstitutionMap subs;
         auto *genericEnv = dc->getGenericEnvironmentOfContext();
         auto typeGenericSig = nominal->getGenericSignatureOfContext();
 
         if (genericEnv && typeGenericSig) {
           // Generate a set of substitutions for the initialization function,
           // whose generic signature is that of the type context, and whose
           // replacement types are the archetypes of the initializer itself.
-          auto subMap = typeGenericSig->getSubstitutionMap(
+          subs = typeGenericSig->getSubstitutionMap(
                        [&](SubstitutableType *type) {
                          if (auto gp = type->getAs<GenericTypeParamType>()) {
                            return genericEnv->mapTypeIntoContext(gp);
@@ -973,9 +973,6 @@ void SILGenFunction::emitMemberInitializers(DeclContext *dc,
                          return ProtocolConformanceRef(
                                   conformedProtocol->getDecl());
                        });
-          SmallVector<Substitution, 4> subsVec;
-          typeGenericSig->getSubstitutions(subMap, subsVec);
-          subs = SGM.getASTContext().AllocateCopy(subsVec);
         }
 
         // Get the type of the initialization result, in terms

lib/SILGen/SILGenConvert.cpp

@@ -593,7 +593,7 @@ ManagedValue SILGenFunction::emitExistentialErasure(
           emitRValueForStorageLoad(
               loc, nativeError, concreteFormalType,
               /*super*/ false, nsErrorVar, RValue(),
-              nsErrorVarSubstitutions.toList(),
+              nsErrorVarSubstitutions,
               AccessSemantics::Ordinary, nsErrorType, SGFContext())
               .getAsSingleValue(*this, loc);
 

lib/SILGen/SILGenExpr.cpp

@@ -1129,7 +1129,7 @@ static SILDeclRef getRValueAccessorDeclRef(SILGenFunction &SGF,
 static RValue
 emitRValueWithAccessor(SILGenFunction &SGF, SILLocation loc,
                        AbstractStorageDecl *storage,
-                       SubstitutionList substitutions,
+                       SubstitutionMap substitutions,
                        ArgumentSource &&baseRV, RValue &&subscriptRV,
                        bool isSuper, AccessStrategy strategy,
                        SILDeclRef accessor,
@@ -1148,7 +1148,7 @@ emitRValueWithAccessor(SILGenFunction &SGF, SILLocation loc,
   // The easy path here is if we don't need to use an addressor.
   case AccessStrategy::DirectToAccessor:
   case AccessStrategy::DispatchToAccessor: {
-    return SGF.emitGetAccessor(loc, accessor, substitutions,
+    return SGF.emitGetAccessor(loc, accessor, substitutions.toList(),
                                std::move(baseRV), isSuper, isDirectUse,
                                std::move(subscriptRV), C);
   }
@@ -1161,7 +1161,7 @@ emitRValueWithAccessor(SILGenFunction &SGF, SILLocation loc,
   SILType storageType = storageTL.getLoweredType().getAddressType();
 
   auto addressorResult =
-    SGF.emitAddressorAccessor(loc, accessor, substitutions,
+    SGF.emitAddressorAccessor(loc, accessor, substitutions.toList(),
                               std::move(baseRV), isSuper, isDirectUse,
                               std::move(subscriptRV), storageType);
 
@@ -1204,7 +1204,7 @@ emitRValueWithAccessor(SILGenFunction &SGF, SILLocation loc,
 RValue SILGenFunction::emitRValueForStorageLoad(
     SILLocation loc, ManagedValue base, CanType baseFormalType,
     bool isSuper, AbstractStorageDecl *storage, RValue indexes,
-    SubstitutionList substitutions,
+    SubstitutionMap substitutions,
     AccessSemantics semantics, Type propTy, SGFContext C,
     bool isBaseGuaranteed) {
   AccessStrategy strategy =
@@ -2498,8 +2498,7 @@ class NominalTypeMemberRefRValueEmitter {
       SGF.emitRValueForStorageLoad(Expr, base, baseFormalType,
                                    Expr->isSuper(),
                                    Field, {},
-                                   Expr->getMember().getSubstitutions()
-                                     .toList(),
+                                   Expr->getMember().getSubstitutions(),
                                    Expr->getAccessSemantics(),
                                    Expr->getType(), Context);
     return result;
@@ -2541,8 +2540,7 @@ class NominalTypeMemberRefRValueEmitter {
         SGF.emitRValueForStorageLoad(Expr, base, baseFormalType,
                                      Expr->isSuper(),
                                      Field, {},
-                                     Expr->getMember().getSubstitutions()
-                                       .toList(),
+                                     Expr->getMember().getSubstitutions(),
                                      Expr->getAccessSemantics(),
                                      Expr->getType(), Context,
                                      base.isPlusZeroRValueOrTrivial());
@@ -2657,7 +2655,7 @@ SILGenFunction::emitApplyOfDefaultArgGenerator(SILLocation loc,
 RValue SILGenFunction::emitApplyOfStoredPropertyInitializer(
     SILLocation loc,
     const PatternBindingEntry &entry,
-    SubstitutionList subs,
+    SubstitutionMap subs,
     CanType resultType,
     AbstractionPattern origResultType,
     SGFContext C) {
@@ -2673,8 +2671,8 @@ RValue SILGenFunction::emitApplyOfStoredPropertyInitializer(
   ResultPlanPtr resultPlan =
       ResultPlanBuilder::computeResultPlan(*this, calleeTypeInfo, loc, C);
   ArgumentScope argScope(*this, loc);
-  return emitApply(std::move(resultPlan), std::move(argScope), loc, fnRef, subs,
-                   {}, calleeTypeInfo, ApplyOptions::None, C);
+  return emitApply(std::move(resultPlan), std::move(argScope), loc, fnRef,
+                   subs.toList(), {}, calleeTypeInfo, ApplyOptions::None, C);
 }
 
 static void emitTupleShuffleExprInto(RValueEmitter &emitter,
@@ -3202,7 +3200,7 @@ static SILFunction *getOrCreateKeyPathGetter(SILGenModule &SGM,
   auto resultSubst = subSGF.emitRValueForStorageLoad(loc, baseSubstValue,
                                    baseType, /*super*/false,
                                    property, std::move(indexValue),
-                                   subs.toList(), AccessSemantics::Ordinary,
+                                   subs, AccessSemantics::Ordinary,
                                    propertyType, SGFContext())
     .getAsSingleValue(subSGF, loc);
   if (resultSubst.getType().getAddressType() != resultArg->getType())

lib/SILGen/SILGenFunction.h

@@ -1083,7 +1083,7 @@ class LLVM_LIBRARY_VISIBILITY SILGenFunction
                                   CanType baseFormalType,
                                   bool isSuper, AbstractStorageDecl *storage,
                                   RValue indexes,
-                                  SubstitutionList substitutions,
+                                  SubstitutionMap substitutions,
                                   AccessSemantics semantics, Type propTy,
                                   SGFContext C,
                                   bool isBaseGuaranteed = false);
@@ -1312,7 +1312,7 @@ class LLVM_LIBRARY_VISIBILITY SILGenFunction
   RValue emitApplyOfStoredPropertyInitializer(
       SILLocation loc,
       const PatternBindingEntry &entry,
-      SubstitutionList subs,
+      SubstitutionMap subs,
       CanType resultType,
       AbstractionPattern origResultType,
       SGFContext C);