[CS] Rename LocatorPathElt::Requirement

Rename to LocatorPathElt::ProtocolRequirement in
order to help avoid confusion with
LocatorPathElt::AnyRequirement.

Author: hamishknight

lib/Sema/ConstraintLocator.cpp

@@ -37,9 +37,11 @@ void ConstraintLocator::Profile(llvm::FoldingSetNodeID &id, Expr *anchor,
       id.AddPointer(elt.castTo<LocatorPathElt::GenericParameter>().getType());
       break;
 
-    case Requirement:
-      id.AddPointer(elt.castTo<LocatorPathElt::Requirement>().getDecl());
+    case ProtocolRequirement: {
+      auto reqElt = elt.castTo<LocatorPathElt::ProtocolRequirement>();
+      id.AddPointer(reqElt.getDecl());
       break;
+    }
 
     case Witness:
       id.AddPointer(elt.castTo<LocatorPathElt::Witness>().getDecl());
@@ -338,9 +340,9 @@ void ConstraintLocator::dump(SourceManager *sm, raw_ostream &out) {
       out << "key path component #" << llvm::utostr(kpElt.getIndex());
       break;
     }
-    case Requirement: {
-      auto reqElt = elt.castTo<LocatorPathElt::Requirement>();
-      out << "requirement ";
+    case ProtocolRequirement: {
+      auto reqElt = elt.castTo<LocatorPathElt::ProtocolRequirement>();
+      out << "protocol requirement ";
       reqElt.getDecl()->dumpRef(out);
       break;
     }

lib/Sema/ConstraintLocator.h

@@ -81,7 +81,7 @@ class ConstraintLocator : public llvm::FoldingSetNode {
     case ExistentialSuperclassType:
     case SequenceElementType:
     case AutoclosureResult:
-    case Requirement:
+    case ProtocolRequirement:
     case Witness:
     case ImplicitlyUnwrappedDisjunctionChoice:
     case DynamicLookupResult:
@@ -148,7 +148,7 @@ class ConstraintLocator : public llvm::FoldingSetNode {
     case GenericArgument:
     case NamedTupleElement:
     case TupleElement:
-    case Requirement:
+    case ProtocolRequirement:
     case Witness:
     case KeyPathComponent:
     case ConditionalRequirement:
@@ -179,7 +179,7 @@ class ConstraintLocator : public llvm::FoldingSetNode {
     /// Describes the kind of data stored here.
     enum StoredKind : unsigned char {
       StoredGenericParameter,
-      StoredRequirement,
+      StoredProtocolRequirement,
       StoredWitness,
       StoredGenericSignature,
       StoredKeyPathDynamicMemberBase,
@@ -291,8 +291,8 @@ class ConstraintLocator : public llvm::FoldingSetNode {
       case StoredGenericParameter:
         return PathElementKind::GenericParameter;
 
-      case StoredRequirement:
-        return PathElementKind::Requirement;
+      case StoredProtocolRequirement:
+        return PathElementKind::ProtocolRequirement;
 
       case StoredWitness:
         return PathElementKind::Witness;
@@ -788,15 +788,15 @@ class LocatorPathElt::Witness final : public LocatorPathElt {
   }
 };
 
-class LocatorPathElt::Requirement final : public LocatorPathElt {
+class LocatorPathElt::ProtocolRequirement final : public LocatorPathElt {
 public:
-  Requirement(ValueDecl *decl)
-      : LocatorPathElt(LocatorPathElt::StoredRequirement, decl) {}
+  ProtocolRequirement(ValueDecl *decl)
+      : LocatorPathElt(LocatorPathElt::StoredProtocolRequirement, decl) {}
 
   ValueDecl *getDecl() const { return getStoredPointer<ValueDecl>(); }
 
   static bool classof(const LocatorPathElt *elt) {
-    return elt->getKind() == ConstraintLocator::Requirement;
+    return elt->getKind() == ConstraintLocator::ProtocolRequirement;
   }
 };
 

lib/Sema/ConstraintLocatorPathElts.def

@@ -128,7 +128,7 @@ SIMPLE_LOCATOR_PATH_ELT(ParentType)
 
 /// The requirement that we're matching during protocol conformance
 /// checking.
-CUSTOM_LOCATOR_PATH_ELT(Requirement)
+CUSTOM_LOCATOR_PATH_ELT(ProtocolRequirement)
 
 /// Type parameter requirements.
 ABSTRACT_LOCATOR_PATH_ELT(AnyRequirement)

lib/Sema/ConstraintSystem.cpp

@@ -1206,8 +1206,8 @@ static void addSelfConstraint(ConstraintSystem &cs, Type objectTy, Type selfTy,
 /// Determine whether the given locator is for a witness or requirement.
 static bool isRequirementOrWitness(const ConstraintLocatorBuilder &locator) {
   if (auto last = locator.last()) {
-    return last->getKind() == ConstraintLocator::Requirement ||
-    last->getKind() == ConstraintLocator::Witness;
+    return last->getKind() == ConstraintLocator::ProtocolRequirement ||
+           last->getKind() == ConstraintLocator::Witness;
   }
 
   return false;

lib/Sema/TypeCheckProtocol.cpp

@@ -724,8 +724,8 @@ swift::matchWitness(TypeChecker &tc,
       selfTy = reqGenericEnv->mapTypeIntoContext(selfTy);
 
     // Open up the type of the requirement.
-    reqLocator = cs->getConstraintLocator(static_cast<Expr *>(nullptr),
-                                          LocatorPathElt::Requirement(req));
+    reqLocator = cs->getConstraintLocator(
+        static_cast<Expr *>(nullptr), LocatorPathElt::ProtocolRequirement(req));
     OpenedTypeMap reqReplacements;
     std::tie(openedFullReqType, reqType)
       = cs->getTypeOfMemberReference(selfTy, req, dc,