AST: Remove origType parameter from substOpaqueTypesWithUnderlyingTypes()

Author: slavapestov

include/swift/AST/Types.h

@@ -5026,7 +5026,7 @@ class SILFunctionConventions;
 CanType substOpaqueTypesWithUnderlyingTypes(CanType type,
                                             TypeExpansionContext context);
 ProtocolConformanceRef
-substOpaqueTypesWithUnderlyingTypes(ProtocolConformanceRef ref, Type origType,
+substOpaqueTypesWithUnderlyingTypes(ProtocolConformanceRef ref,
                                     TypeExpansionContext context);
 namespace Lowering {
   class TypeConverter;

include/swift/SIL/SILCloner.h

@@ -576,7 +576,7 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
           !context.shouldLookThroughOpaqueTypeArchetypes())
         return C;
 
-      return substOpaqueTypesWithUnderlyingTypes(C, Ty, context);
+      return substOpaqueTypesWithUnderlyingTypes(C, context);
     }
 
     return C;

lib/AST/TypeSubstitution.cpp

@@ -1089,7 +1089,7 @@ CanType swift::substOpaqueTypesWithUnderlyingTypes(CanType ty,
 }
 
 static ProtocolConformanceRef substOpaqueTypesWithUnderlyingTypesRec(
-    ProtocolConformanceRef ref, Type origType, const DeclContext *inContext,
+    ProtocolConformanceRef ref, const DeclContext *inContext,
     ResilienceExpansion contextExpansion, bool isWholeModuleContext,
     llvm::DenseSet<ReplaceOpaqueTypesWithUnderlyingTypes::SeenDecl> &decls) {
   ReplaceOpaqueTypesWithUnderlyingTypes replacer(inContext, contextExpansion,
@@ -1100,7 +1100,7 @@ static ProtocolConformanceRef substOpaqueTypesWithUnderlyingTypesRec(
 }
 
 ProtocolConformanceRef swift::substOpaqueTypesWithUnderlyingTypes(
-    ProtocolConformanceRef ref, Type origType, TypeExpansionContext context) {
+    ProtocolConformanceRef ref, TypeExpansionContext context) {
   ReplaceOpaqueTypesWithUnderlyingTypes replacer(
       context.getContext(), context.getResilienceExpansion(),
       context.isWholeModuleContext());
@@ -1174,7 +1174,7 @@ operator()(CanType maybeOpaqueType, Type replacementType,
       }
 
       auto res = ::substOpaqueTypesWithUnderlyingTypesRec(
-          substRef, substTy, inContext, contextExpansion, isContextWholeModule,
+          substRef, inContext, contextExpansion, isContextWholeModule,
           *alreadySeen);
       alreadySeen->erase(seenKey);
       return res;
@@ -1184,7 +1184,7 @@ operator()(CanType maybeOpaqueType, Type replacementType,
       llvm::DenseSet<SeenDecl> seenDecls;
       seenDecls.insert(seenKey);
       return ::substOpaqueTypesWithUnderlyingTypesRec(
-          substRef, substTy, inContext, contextExpansion, isContextWholeModule,
+          substRef, inContext, contextExpansion, isContextWholeModule,
           seenDecls);
     }
   }

lib/IRGen/MetadataRequest.cpp

@@ -560,7 +560,7 @@ IRGenModule::substOpaqueTypesWithUnderlyingTypes(CanType type,
     auto context = getMaximalTypeExpansionContext();
     return std::make_pair(
        swift::substOpaqueTypesWithUnderlyingTypes(type, context),
-       swift::substOpaqueTypesWithUnderlyingTypes(conformance, type, context));
+       swift::substOpaqueTypesWithUnderlyingTypes(conformance, context));
   }
 
   return std::make_pair(type, conformance);

lib/SIL/IR/SILTypeSubstitution.cpp

@@ -77,7 +77,6 @@ class SILTypeSubstituter :
         return substOpaqueTypesWithUnderlyingTypes(
                ProtocolConformanceRef::forAbstract(conformingReplacementType,
                                                    conformedProtocol),
-               conformingReplacementType->getCanonicalType(),
                typeExpansionContext);
       },
       SubstFlags::SubstituteOpaqueArchetypes |
@@ -292,7 +291,7 @@ class SILTypeSubstituter :
       });
       if (substType->hasOpaqueArchetype()) {
         substConformance = substOpaqueTypesWithUnderlyingTypes(
-            substConformance, substType, typeExpansionContext);
+            substConformance, typeExpansionContext);
       }
     }