Address review feedback on AbstractConformance in ProtocolConformanceRef

Author: DougGregor

include/swift/AST/ASTBridgingImpl.h

@@ -602,7 +602,7 @@ BridgedASTType BridgedConformance::getType() const {
 }
 
 BridgedDeclObj BridgedConformance::getRequirement() const {
-  return {unbridged().getRequirement()};
+  return {unbridged().getProtocol()};
 }
 
 BridgedConformance BridgedConformance::getGenericConformance() const {

include/swift/AST/ProtocolConformanceRef.h

@@ -179,10 +179,10 @@ class ProtocolConformanceRef {
   }
 
   /// Retrieve the conforming type.
-  Type getConformingType() const;
+  Type getType() const;
 
   /// Return the protocol requirement.
-  ProtocolDecl *getRequirement() const;
+  ProtocolDecl *getProtocol() const;
 
   /// Apply a substitution to the conforming type.
   ProtocolConformanceRef subst(Type origType, SubstitutionMap subMap,

lib/APIDigester/ModuleAnalyzerNodes.cpp

@@ -1498,7 +1498,7 @@ SDKNodeInitInfo::SDKNodeInitInfo(SDKContext &Ctx, ImportDecl *ID):
 }
 
 SDKNodeInitInfo::SDKNodeInitInfo(SDKContext &Ctx, ProtocolConformanceRef Conform):
-    SDKNodeInitInfo(Ctx, Conform.getRequirement()) {
+    SDKNodeInitInfo(Ctx, Conform.getProtocol()) {
   // The conformance can be conditional. The generic signature keeps track of
   // the requirements.
   if (Conform.isConcrete()) {

lib/AST/ASTContext.cpp

@@ -5109,7 +5109,7 @@ void SILFunctionType::Profile(
   invocationSubs.profile(id);
   id.AddBoolean((bool)conformance);
   if (conformance)
-    id.AddPointer(conformance.getRequirement());
+    id.AddPointer(conformance.getProtocol());
 }
 
 SILFunctionType::SILFunctionType(

lib/AST/ASTDumper.cpp

@@ -5519,7 +5519,7 @@ class PrintConformance : public PrintBase {
       assert(conformance.isAbstract());
 
       printHead("abstract_conformance", ASTNodeColor, label);
-      printReferencedDeclField(conformance.getRequirement(),
+      printReferencedDeclField(conformance.getProtocol(),
                                Label::always("protocol"));
       printFoot();
     }

lib/AST/ASTMangler.cpp

@@ -2170,7 +2170,7 @@ void ASTMangler::appendRetroactiveConformances(SubstitutionMap subMap,
     if (conformance.isInvalid())
       continue;
 
-    if (conformance.getRequirement()->isMarkerProtocol())
+    if (conformance.getProtocol()->isMarkerProtocol())
       continue;
 
     SWIFT_DEFER {
@@ -4528,7 +4528,7 @@ void ASTMangler::appendAnyProtocolConformance(
   // If we have a conformance to a marker protocol but we aren't allowed to
   // emit marker protocols, skip it.
   if (!AllowMarkerProtocols &&
-      conformance.getRequirement()->isMarkerProtocol())
+      conformance.getProtocol()->isMarkerProtocol())
     return;
 
   // While all invertible protocols are marker protocols, do not mangle them
@@ -4537,15 +4537,17 @@ void ASTMangler::appendAnyProtocolConformance(
   // but we *might* have let that slip by for the other cases below, so the
   // early-exits are highly conservative.
   const bool forInvertible =
-      conformance.getRequirement()->getInvertibleProtocolKind().has_value();
+      conformance.getProtocol()->getInvertibleProtocolKind().has_value();
 
   if (conformingType->isTypeParameter()) {
     assert(genericSig && "Need a generic signature to resolve conformance");
     if (forInvertible)
       return;
 
+    // FIXME: conformingType parameter should no longer be needed, because
+    // its in conformance.
     auto path = genericSig->getConformancePath(conformingType,
-                                               conformance.getRequirement());
+                                               conformance.getProtocol());
     appendDependentProtocolConformance(path, genericSig);
   } else if (auto opaqueType = conformingType->getAs<OpaqueTypeArchetypeType>()) {
     if (forInvertible)
@@ -4556,7 +4558,7 @@ void ASTMangler::appendAnyProtocolConformance(
     ConformancePath conformancePath =
         opaqueSignature->getConformancePath(
           opaqueType->getInterfaceType(),
-          conformance.getRequirement());
+          conformance.getProtocol());
 
     // Append the conformance path with the signature of the opaque type.
     appendDependentProtocolConformance(conformancePath, opaqueSignature);

lib/AST/ASTPrinter.cpp

@@ -6634,7 +6634,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       case SILFunctionType::Representation::WitnessMethod:
         Printer << "witness_method: ";
         printTypeDeclName(
-            witnessMethodConformance.getRequirement()->getDeclaredType()
+            witnessMethodConformance.getProtocol()->getDeclaredType()
                 ->castTo<ProtocolType>());
         break;
       case SILFunctionType::Representation::Closure:

lib/AST/ASTVerifier.cpp

@@ -1785,7 +1785,7 @@ class Verifier : public ASTWalker {
         for (auto proto : erasedLayout.getProtocols()) {
           if (std::find_if(conformances.begin(), conformances.end(),
                            [&](ProtocolConformanceRef ref) -> bool {
-                             return ref.getRequirement() == proto->getDecl();
+                             return ref.getProtocol() == proto->getDecl();
                            })
               == conformances.end()) {
             Out << "ErasureExpr is missing conformance for required protocol\n";
@@ -1819,7 +1819,7 @@ class Verifier : public ASTWalker {
                     anyHashableDecl->getDeclaredInterfaceType(),
                     "AnyHashableErasureExpr and the standard AnyHashable type");
 
-      if (E->getConformance().getRequirement() != hashableDecl) {
+      if (E->getConformance().getProtocol() != hashableDecl) {
         Out << "conformance on AnyHashableErasureExpr was not for Hashable\n";
         E->getConformance().dump(Out);
         abort();
@@ -2811,7 +2811,7 @@ class Verifier : public ASTWalker {
         if (!type->is<ArchetypeType>() && !type->isAnyExistentialType()) {
           Out << "type " << type
               << " should not have an abstract conformance to "
-              << conformance.getRequirement()->getName();
+              << conformance.getProtocol()->getName();
           abort();
         }
 

lib/AST/AbstractConformance.h

@@ -29,11 +29,11 @@ class AbstractConformance final : public llvm::FoldingSetNode {
   AbstractConformance(Type conformingType, ProtocolDecl *requirement)
     : conformingType(conformingType), requirement(requirement) { }
 
-  Type getConformingType() const { return conformingType; }
-  ProtocolDecl *getRequirement() const { return requirement; }
+  Type getType() const { return conformingType; }
+  ProtocolDecl *getProtocol() const { return requirement; }
 
   void Profile(llvm::FoldingSetNodeID &id) const {
-    Profile(id, getConformingType(), getRequirement());
+    Profile(id, getType(), getProtocol());
   }
 
   /// Profile the substitution map storage, for use with LLVM's FoldingSet.

lib/AST/Effects.cpp

@@ -136,7 +136,7 @@ void swift::simple_display(llvm::raw_ostream &out,
 
 bool ProtocolConformanceRef::hasEffect(EffectKind kind) const {
   if (!isConcrete()) { return kind != EffectKind::Unsafe; }
-  return evaluateOrDefault(getRequirement()->getASTContext().evaluator,
+  return evaluateOrDefault(getProtocol()->getASTContext().evaluator,
      ConformanceHasEffectRequest{kind, getConcrete()},
      true);
 }