AST: Pass SubstOptions to DependentMemberType::substBaseType()

Author: slavapestov

include/swift/AST/Types.h

@@ -6798,11 +6798,13 @@ class DependentMemberType : public TypeBase {
   /// Substitute the base type, looking up our associated type in it if it is
   /// non-dependent. Returns null if the member could not be found in the new
   /// base.
-  Type substBaseType(Type base, LookupConformanceFn lookupConformance);
+  Type substBaseType(Type base, LookupConformanceFn lookupConformance,
+                     SubstOptions options);
 
   /// Substitute the root generic type, looking up the chain of associated types.
   /// Returns null if the member could not be found in the new root.
-  Type substRootParam(Type newRoot, LookupConformanceFn lookupConformance);
+  Type substRootParam(Type newRoot, LookupConformanceFn lookupConformance,
+                      SubstOptions options);
 
   // Implement isa/cast/dyncast/etc.
   static bool classof(const TypeBase *T) {

lib/AST/RequirementMachine/GenericSignatureQueries.cpp

@@ -346,7 +346,8 @@ static Type substPrefixType(Type type, unsigned suffixLength, Type prefixType,
   auto substBaseType = substPrefixType(memberType->getBase(), suffixLength - 1,
                                        prefixType, sig);
   return memberType->substBaseType(substBaseType,
-                                   LookUpConformanceInSignature(sig.getPointer()));
+                                   LookUpConformanceInSignature(sig.getPointer()),
+                                   llvm::None);
 }
 
 /// Unlike most other queries, the input type can be any type, not just a

lib/AST/Type.cpp

@@ -5595,7 +5595,7 @@ TypeBase::getAutoDiffTangentSpace(LookupConformanceFn lookupConformance) {
 
   // Try to get the `TangentVector` associated type of `base`.
   // Return the associated type if it is valid.
-  auto assocTy = dependentType->substBaseType(this, lookupConformance);
+  auto assocTy = dependentType->substBaseType(this, lookupConformance, llvm::None);
   if (!assocTy->hasError())
     return cache(TangentSpace::getTangentVector(assocTy));
 

lib/AST/TypeSubstitution.cpp

@@ -274,30 +274,32 @@ operator()(CanType dependentType, Type conformingReplacementType,
 }
 
 Type DependentMemberType::substBaseType(ModuleDecl *module, Type substBase) {
-  return substBaseType(substBase, LookUpConformanceInModule(module));
+  return substBaseType(substBase, LookUpConformanceInModule(module), llvm::None);
 }
 
 Type DependentMemberType::substBaseType(Type substBase,
-                                        LookupConformanceFn lookupConformance) {
+                                        LookupConformanceFn lookupConformance,
+                                        SubstOptions options) {
   if (substBase.getPointer() == getBase().getPointer() &&
       substBase->hasTypeParameter())
     return this;
 
-  InFlightSubstitution IFS(nullptr, lookupConformance, llvm::None);
+  InFlightSubstitution IFS(nullptr, lookupConformance, options);
   return getMemberForBaseType(IFS, getBase(), substBase,
                               getAssocType(), getName(),
                               /*level=*/0);
 }
 
 Type DependentMemberType::substRootParam(Type newRoot,
-                                         LookupConformanceFn lookupConformance){
+                                         LookupConformanceFn lookupConformance,
+                                         SubstOptions options) {
   auto base = getBase();
   if (base->is<GenericTypeParamType>()) {
-    return substBaseType(newRoot, lookupConformance);
+    return substBaseType(newRoot, lookupConformance, options);
   }
   if (auto depMem = base->getAs<DependentMemberType>()) {
-    return substBaseType(depMem->substRootParam(newRoot, lookupConformance),
-                         lookupConformance);
+    return substBaseType(depMem->substRootParam(newRoot, lookupConformance, options),
+                         lookupConformance, options);
   }
   return Type();
 }

lib/SILGen/ResultPlan.cpp

@@ -136,7 +136,8 @@ mapTypeOutOfOpenedExistentialContext(CanType t) {
         if (auto *dmt =
                 archTy->getInterfaceType()->getAs<DependentMemberType>()) {
           return dmt->substRootParam(params[index],
-                                     MakeAbstractConformanceForGenericType());
+                                     MakeAbstractConformanceForGenericType(),
+                                     llvm::None);
         }
 
         return params[index];