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

Author: slavapestov

include/swift/AST/ProtocolConformanceRef.h

@@ -234,7 +234,7 @@ class ProtocolConformanceRef {
     return llvm::hash_value(conformance.Union.getOpaqueValue());
   }
 
-  Type getTypeWitnessByName(Type type, Identifier name) const;
+  Type getTypeWitnessByName(Identifier name) const;
 
   /// Find a particular named function witness for a type that conforms to
   /// the given protocol.

lib/AST/ASTContext.cpp

@@ -6486,7 +6486,7 @@ Type ASTContext::getBridgedToObjC(const DeclContext *dc, Type type,
       *bridgedValueType = type;
 
     // Find the Objective-C class type we bridge to.
-    Type witnessTy = conformance.getTypeWitnessByName(type, Id_ObjectiveCType);
+    Type witnessTy = conformance.getTypeWitnessByName(Id_ObjectiveCType);
     // If Objective-C import is broken, witness type would be a dependent member
     // with `<<error type>>` base.
     return (witnessTy && !witnessTy->hasError()) ? witnessTy : Type();

lib/AST/DistributedDecl.cpp

@@ -203,7 +203,7 @@ Type swift::getDistributedActorSystemType(NominalTypeDecl *actor) {
   // Dig out the actor system type.
   Type selfType = actor->getSelfInterfaceType();
   auto conformance = lookupConformance(selfType, DA);
-  return conformance.getTypeWitnessByName(selfType, C.Id_ActorSystem);
+  return conformance.getTypeWitnessByName(C.Id_ActorSystem);
 }
 
 Type swift::getDistributedActorIDType(NominalTypeDecl *actor) {
@@ -220,7 +220,7 @@ static Type getTypeWitnessByName(NominalTypeDecl *type, ProtocolDecl *protocol,
   auto conformance = lookupConformance(selfType, protocol);
   if (!conformance || conformance.isInvalid())
     return Type();
-  return conformance.getTypeWitnessByName(selfType, member);
+  return conformance.getTypeWitnessByName(member);
 }
 
 Type swift::getDistributedActorSerializationType(
@@ -301,8 +301,7 @@ Type swift::getDistributedSerializationRequirementType(
   if (conformance.isInvalid())
     return Type();
 
-  return conformance.getTypeWitnessByName(selfType,
-                                          ctx.Id_SerializationRequirement);
+  return conformance.getTypeWitnessByName(ctx.Id_SerializationRequirement);
 }
 
 AbstractFunctionDecl *

lib/AST/ProtocolConformanceRef.cpp

@@ -149,7 +149,7 @@ ProtocolConformanceRef ProtocolConformanceRef::mapConformanceOutOfContext() cons
 }
 
 Type
-ProtocolConformanceRef::getTypeWitnessByName(Type type, Identifier name) const {
+ProtocolConformanceRef::getTypeWitnessByName(Identifier name) const {
   assert(!isInvalid());
 
   // Find the named requirement.

lib/PrintAsClang/DeclAndTypePrinter.cpp

@@ -2207,8 +2207,7 @@ class DeclAndTypePrinter::Implementation
       return nullptr;
 
     // Dig out the Objective-C type.
-    Type objcType = conformance.getTypeWitnessByName(
-        declaredType, ctx.Id_ObjectiveCType);
+    Type objcType = conformance.getTypeWitnessByName(ctx.Id_ObjectiveCType);
 
     // Dig out the Objective-C class.
     return objcType->getClassOrBoundGenericClass();

lib/SIL/IR/Bridging.cpp

@@ -240,7 +240,7 @@ Type TypeConverter::getLoweredCBridgedType(AbstractionPattern pattern,
     assert(conformance && "Missing conformance?");
     Type bridgedTy =
       ProtocolConformanceRef(conformance).getTypeWitnessByName(
-        t, M.getASTContext().Id_ObjectiveCType);
+        M.getASTContext().Id_ObjectiveCType);
     if (purpose == BridgedTypePurpose::ForResult && clangTy)
       bridgedTy = OptionalType::get(bridgedTy);
     return bridgedTy;

lib/Sema/CSApply.cpp

@@ -8106,7 +8106,7 @@ Expr *ExprRewriter::convertLiteralInPlace(
   if (!literalType.empty()) {
     // Extract the literal type.
     Type builtinLiteralType =
-        conformance.getTypeWitnessByName(type, literalType);
+        conformance.getTypeWitnessByName(literalType);
     if (builtinLiteralType->hasError())
       return nullptr;
 
@@ -8222,9 +8222,8 @@ std::pair<Expr *, ArgumentList *> ExprRewriter::buildDynamicCallable(
     auto dictLitProto =
         ctx.getProtocol(KnownProtocolKind::ExpressibleByDictionaryLiteral);
     auto conformance = checkConformance(argumentType, dictLitProto);
-    auto keyType = conformance.getTypeWitnessByName(argumentType, ctx.Id_Key);
-    auto valueType =
-        conformance.getTypeWitnessByName(argumentType, ctx.Id_Value);
+    auto keyType = conformance.getTypeWitnessByName(ctx.Id_Key);
+    auto valueType = conformance.getTypeWitnessByName(ctx.Id_Value);
     SmallVector<Identifier, 4> names;
     SmallVector<Expr *, 4> dictElements;
     for (auto arg : *args) {

lib/Sema/CSDiagnostics.cpp

@@ -3302,7 +3302,7 @@ bool ContextualFailure::diagnoseThrowsTypeMismatch() const {
     if (conformance && toErrorExistential) {
       Type errorType =
           conformance
-              .getTypeWitnessByName(errorCodeType, getASTContext().Id_ErrorType)
+              .getTypeWitnessByName(getASTContext().Id_ErrorType)
               ->getCanonicalType();
       if (errorType) {
         auto diagnostic = emitDiagnostic(diag::cannot_throw_error_code,

lib/Sema/ConstraintSystem.cpp

@@ -3886,7 +3886,7 @@ Type constraints::isRawRepresentable(ConstraintSystem &cs, Type type) {
   if (conformance.isInvalid())
     return Type();
 
-  return conformance.getTypeWitnessByName(type, cs.getASTContext().Id_RawValue);
+  return conformance.getTypeWitnessByName(cs.getASTContext().Id_RawValue);
 }
 
 void ConstraintSystem::generateOverloadConstraints(

lib/Sema/DerivedConformanceDifferentiable.cpp

@@ -121,7 +121,7 @@ static Type getTangentVectorInterfaceType(Type contextualType,
   assert(conf && "Contextual type must conform to `Differentiable`");
   if (!conf)
     return nullptr;
-  auto tanType = conf.getTypeWitnessByName(contextualType, C.Id_TangentVector);
+  auto tanType = conf.getTypeWitnessByName(C.Id_TangentVector);
   return tanType->hasArchetype() ? tanType->mapTypeOutOfContext() : tanType;
 }
 
@@ -150,7 +150,7 @@ static bool canDeriveTangentVectorAsSelf(NominalTypeDecl *nominal,
     auto conf = checkConformance(fieldType, diffableProto);
     if (!conf)
       return false;
-    auto tangentType = conf.getTypeWitnessByName(fieldType, C.Id_TangentVector);
+    auto tangentType = conf.getTypeWitnessByName(C.Id_TangentVector);
     if (!fieldType->isEqual(tangentType))
       return false;
   }