[ConstraintSystem] Adds the new overload to FailureDiagnostic as well and remove other instances of 0 summary flags

Author: theblixguy

lib/Sema/CSDiagnostics.cpp

@@ -151,7 +151,7 @@ ProtocolConformance *RequirementFailure::getConformanceForConditionalReq(
     return nullptr;
   }
 
-  auto *typeReqLoc = cs.getConstraintLocator(getRawAnchor(), path.drop_back());
+  auto *typeReqLoc = getConstraintLocator(getRawAnchor(), path.drop_back());
 
   auto result = llvm::find_if(
       cs.CheckedConformances,
@@ -1837,8 +1837,7 @@ bool MissingCallFailure::diagnoseAsError() {
 
     case ConstraintLocator::AutoclosureResult: {
       auto &cs = getConstraintSystem();
-      auto loc = cs.getConstraintLocator(getRawAnchor(), path.drop_back(),
-                                         /*summaryFlags=*/0);
+      auto loc = cs.getConstraintLocator(getRawAnchor(), path.drop_back());
       AutoClosureForwardingFailure failure(cs, loc);
       return failure.diagnoseAsError();
     }

lib/Sema/CSDiagnostics.h

@@ -147,6 +147,14 @@ class FailureDiagnostic {
     return nullptr;
   }
 
+  /// Retrive the constraint locator for the given anchor and
+  /// path, uniqued and automatically calculate the summary flags
+  ConstraintLocator *
+  getConstraintLocator(Expr *anchor,
+                       ArrayRef<ConstraintLocator::PathElement> path) {
+    return CS.getConstraintLocator(anchor, path);
+  }
+
   /// \returns true is locator hasn't been simplified down to expression.
   bool hasComplexLocator() const { return HasComplexLocator; }
 

lib/Sema/CSSimplify.cpp

@@ -2245,8 +2245,7 @@ bool ConstraintSystem::repairFailures(
                                       getASTContext().TheEmptyTupleType);
       conversionsOrFixes.push_back(AddMissingArguments::create(
           *this, fnType, {FunctionType::Param(*arg)},
-          getConstraintLocator(anchor, path,
-                               /*summaryFlags=*/0)));
+          getConstraintLocator(anchor, path)));
     }
     break;
   }

lib/Sema/CSStep.cpp

@@ -313,8 +313,8 @@ StepResult ComponentStep::take(bool prevFailed) {
       // Let's drop `generic parameter '...'` part of the locator to
       // group all of the missing generic parameters related to the
       // same path together.
-      defaultableGenericParams[CS.getConstraintLocator(anchor, path.drop_back(),
-                                                       /*summaryFlags=*/0)]
+      defaultableGenericParams[CS.getConstraintLocator(anchor,
+                                                       path.drop_back())]
           .push_back(locator->getGenericParameter());
     }