[Sema] NFC: Add accessors to check whether locator is type or conditional requirement

Author: xedin

lib/Sema/CSDiagnostics.h

@@ -186,11 +186,11 @@ class RequirementFailure : public FailureDiagnostic {
     assert(!path.empty());
 
     auto &last = path.back();
-    assert(last.getKind() == ConstraintLocator::TypeParameterRequirement ||
-           last.getKind() == ConstraintLocator::ConditionalRequirement);
+    assert(last.isTypeParameterRequirement() ||
+           last.isConditionalRequirement());
     assert(static_cast<RequirementKind>(last.getValue2()) == kind);
 
-    IsConditional = last.getKind() == ConstraintLocator::ConditionalRequirement;
+    IsConditional = last.isConditionalRequirement();
 
     // It's possible sometimes not to have no base expression.
     if (!expr)
@@ -205,10 +205,8 @@ class RequirementFailure : public FailureDiagnostic {
     assert(!path.empty());
 
     auto &requirementLoc = path.back();
-    assert(requirementLoc.getKind() ==
-               ConstraintLocator::TypeParameterRequirement ||
-           requirementLoc.getKind() ==
-               ConstraintLocator::ConditionalRequirement);
+    assert(requirementLoc.isTypeParameterRequirement() ||
+           requirementLoc.isConditionalRequirement());
     return requirementLoc.getValue();
   }
 

lib/Sema/CSSimplify.cpp

@@ -1615,7 +1615,7 @@ static ConstraintFix *fixRequirementFailure(ConstraintSystem &cs, Type type1,
   auto req = path.back();
 
   ConstraintLocator *reqLoc = nullptr;
-  if (req.getKind() == ConstraintLocator::ConditionalRequirement) {
+  if (req.isConditionalRequirement()) {
     // If underlaying conformance requirement has been fixed as
     // we there is no reason to fix up conditional requirements.
     if (cs.hasFixFor(cs.getConstraintLocator(anchor, req)))
@@ -2777,11 +2777,13 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
     SmallVector<LocatorPathElt, 4> path;
     auto *anchor = locator.getLocatorParts(path);
 
-    if (!path.empty() &&
-        (path.back().getKind() == ConstraintLocator::TypeParameterRequirement ||
-         path.back().getKind() == ConstraintLocator::ConditionalRequirement)) {
+    if (path.empty())
+      return SolutionKind::Error;
+
+    if (path.back().isTypeParameterRequirement() ||
+        path.back().isConditionalRequirement()) {
       ConstraintLocator *reqLoc = nullptr;
-      if (path.back().getKind() == ConstraintLocator::ConditionalRequirement) {
+      if (path.back().isConditionalRequirement()) {
         // Underlying conformance requirement is itself fixed,
         // this wouldn't lead to right solution.
         if (hasFixFor(getConstraintLocator(anchor, path.back())))

lib/Sema/ConstraintLocator.h

@@ -421,6 +421,14 @@ class ConstraintLocator : public llvm::FoldingSetNode {
     unsigned getNewSummaryFlags() const {
       return getSummaryFlagsForPathElement(getKind());
     }
+
+    bool isTypeParameterRequirement() const {
+      return getKind() == PathElementKind::TypeParameterRequirement;
+    }
+
+    bool isConditionalRequirement() const {
+      return getKind() == PathElementKind::ConditionalRequirement;
+    }
   };
 
   /// Return the summary flags for an entire path.