Merge pull request swiftlang#18753 from xedin/add-kind-to-req-locator

[ConstraintSystem] Add `kind` to generic requirement locator

Author: xedin

lib/Sema/ConstraintLocator.cpp

@@ -243,9 +243,26 @@ void ConstraintLocator::dump(SourceManager *sm, raw_ostream &out) {
       out << "conditional requirement #" << llvm::utostr(elt.getValue());
       break;
 
-    case TypeParameterRequirement:
-      out << "type parameter requirement #" << llvm::utostr(elt.getValue());
+    case TypeParameterRequirement: {
+      out << "type parameter requirement #" << llvm::utostr(elt.getValue())
+          << " (";
+      switch (static_cast<RequirementKind>(elt.getValue2())) {
+      case RequirementKind::Conformance:
+        out << "conformance";
+        break;
+      case RequirementKind::Superclass:
+        out << "superclass";
+        break;
+      case RequirementKind::SameType:
+        out << "same-type";
+        break;
+      case RequirementKind::Layout:
+        out << "layout";
+        break;
+      }
+      out << ")";
       break;
+    }
 
     case ImplicitlyUnwrappedDisjunctionChoice:
       out << "implicitly unwrapped disjunction choice";

lib/Sema/ConstraintLocator.h

@@ -174,9 +174,9 @@ class ConstraintLocator : public llvm::FoldingSetNode {
     case TupleElement:
     case KeyPathComponent:
     case ConditionalRequirement:
-    case TypeParameterRequirement:
       return 1;
 
+    case TypeParameterRequirement:
     case ApplyArgToParam:
       return 2;
     }
@@ -365,8 +365,10 @@ class ConstraintLocator : public llvm::FoldingSetNode {
       return PathElement(ConditionalRequirement, index);
     }
 
-    static PathElement getTypeRequirementComponent(unsigned index) {
-      return PathElement(TypeParameterRequirement, index);
+    static PathElement getTypeRequirementComponent(unsigned index,
+                                                   RequirementKind kind) {
+      return PathElement(TypeParameterRequirement, index,
+                         static_cast<unsigned>(kind));
     }
 
     /// \brief Retrieve the kind of path element.

lib/Sema/ConstraintSystem.cpp

@@ -1189,7 +1189,8 @@ void ConstraintSystem::openGenericRequirements(
     addConstraint(
         *openedReq,
         locator.withPathElement(ConstraintLocator::OpenedGeneric)
-            .withPathElement(LocatorPathElt::getTypeRequirementComponent(pos)));
+            .withPathElement(
+                LocatorPathElt::getTypeRequirementComponent(pos, kind)));
   }
 }