AST: Remove type parameter from ProtocolConformanceRef::getWitnessByName()

Author: slavapestov

include/swift/AST/ProtocolConformanceRef.h

@@ -242,7 +242,7 @@ class ProtocolConformanceRef {
   /// \param type The conforming type.
   ///
   /// \param name The name of the requirement.
-  ConcreteDeclRef getWitnessByName(Type type, DeclName name) const;
+  ConcreteDeclRef getWitnessByName(DeclName name) const;
 
   /// Determine whether this conformance is canonical.
   bool isCanonical() const;

lib/AST/ASTContext.cpp

@@ -1678,7 +1678,7 @@ ASTContext::getBuiltinInitDecl(NominalTypeDecl *decl,
   }
 
   auto *ctx = const_cast<ASTContext *>(this);
-  witness = builtinConformance.getWitnessByName(type, initName(*ctx));
+  witness = builtinConformance.getWitnessByName(initName(*ctx));
   if (!witness) {
     assert(false && "Missing required witness");
     witness = ConcreteDeclRef();

lib/AST/ActorIsolation.cpp

@@ -61,7 +61,7 @@ ActorIsolation::forActorInstanceParameter(Expr *actor,
     if (auto globalActor = ctx.getProtocol(KnownProtocolKind::GlobalActor)) {
       auto conformance = checkConformance(baseType, globalActor);
       if (conformance &&
-          conformance.getWitnessByName(baseType, ctx.Id_shared) == declRef) {
+          conformance.getWitnessByName(ctx.Id_shared) == declRef) {
         return ActorIsolation::forGlobalActor(baseType);
       }
     }

lib/AST/ProtocolConformanceRef.cpp

@@ -164,7 +164,7 @@ ProtocolConformanceRef::getTypeWitnessByName(Identifier name) const {
 }
 
 ConcreteDeclRef
-ProtocolConformanceRef::getWitnessByName(Type type, DeclName name) const {
+ProtocolConformanceRef::getWitnessByName(DeclName name) const {
   // Find the named requirement.
   auto *proto = getProtocol();
   auto *requirement = proto->getSingleRequirement(name);
@@ -174,7 +174,7 @@ ProtocolConformanceRef::getWitnessByName(Type type, DeclName name) const {
   // For a type with dependent conformance, just return the requirement from
   // the protocol. There are no protocol conformance tables.
   if (!isConcrete()) {
-    auto subs = SubstitutionMap::getProtocolSubstitutions(proto, type, *this);
+    auto subs = SubstitutionMap::getProtocolSubstitutions(proto, getType(), *this);
     return ConcreteDeclRef(requirement, subs);
   }
 

lib/Sema/CSApply.cpp

@@ -2970,7 +2970,7 @@ namespace {
         DeclName constrName(ctx, DeclBaseName::createConstructor(), argLabels);
 
         ConcreteDeclRef witness =
-            conformance.getWitnessByName(type->getRValueType(), constrName);
+            conformance.getWitnessByName(constrName);
         if (!witness || !isa<AbstractFunctionDecl>(witness.getDecl()))
           return nullptr;
         return witness;
@@ -3108,8 +3108,7 @@ namespace {
 
       auto constrName = TypeChecker::getObjectLiteralConstructorName(ctx, expr);
 
-      ConcreteDeclRef witness = conformance.getWitnessByName(
-          conformingType->getRValueType(), constrName);
+      ConcreteDeclRef witness = conformance.getWitnessByName(constrName);
 
       auto selectedOverload = solution.getOverloadChoiceIfAvailable(
           cs.getConstraintLocator(expr, ConstraintLocator::ConstructorMember));
@@ -3822,7 +3821,7 @@ namespace {
         DeclName name(ctx, DeclBaseName::createConstructor(),
                       {ctx.Id_arrayLiteral});
         ConcreteDeclRef witness =
-            conformance.getWitnessByName(arrayTy->getRValueType(), name);
+            conformance.getWitnessByName(name);
         if (!witness || !isa<AbstractFunctionDecl>(witness.getDecl()))
           return nullptr;
         expr->setInitializer(witness);
@@ -3868,7 +3867,7 @@ namespace {
       DeclName name(ctx, DeclBaseName::createConstructor(),
                     {ctx.Id_dictionaryLiteral});
       ConcreteDeclRef witness =
-          conformance.getWitnessByName(dictionaryTy->getRValueType(), name);
+          conformance.getWitnessByName(name);
       if (!witness || !isa<AbstractFunctionDecl>(witness.getDecl()))
         return nullptr;
       expr->setInitializer(witness);
@@ -8081,7 +8080,7 @@ Expr *ExprRewriter::convertLiteralInPlace(
       // Find the witness that we'll use to initialize the type via a builtin
       // literal.
       auto witness = builtinConformance.getWitnessByName(
-          type->getRValueType(), builtinLiteralFuncName);
+          builtinLiteralFuncName);
       if (!witness || !isa<AbstractFunctionDecl>(witness.getDecl()))
         return nullptr;
 
@@ -8120,7 +8119,7 @@ Expr *ExprRewriter::convertLiteralInPlace(
 
   // Find the witness that we'll use to initialize the literal value.
   auto witness =
-      conformance.getWitnessByName(type->getRValueType(), literalFuncName);
+      conformance.getWitnessByName(literalFuncName);
   if (!witness || !isa<AbstractFunctionDecl>(witness.getDecl()))
     return nullptr;
 

lib/Sema/CSSimplify.cpp

@@ -11726,7 +11726,7 @@ ConstraintSystem::simplifyValueWitnessConstraint(
     return formUnsolved();
 
   auto witness =
-      conformance.getWitnessByName(baseObjectType, requirement->getName());
+      conformance.getWitnessByName(requirement->getName());
   if (!witness)
     return fail();
 

lib/Sema/DerivedConformanceDifferentiable.cpp

@@ -50,10 +50,9 @@ static bool canInvokeMoveByOnProperty(
     return true;
   // When the property is a `let`, the only case that would be supported is when
   // it has a `move(by:)` protocol requirement witness that is non-mutating.
-  auto interfaceType = vd->getInterfaceType();
   auto &C = vd->getASTContext();
   auto witness = diffableConformance.getWitnessByName(
-      interfaceType, DeclName(C, C.Id_move, {C.Id_by}));
+      DeclName(C, C.Id_move, {C.Id_by}));
   if (!witness)
     return false;
   auto *decl = cast<FuncDecl>(witness.getDecl());