[Diagnostics] NFC: Move is{Array, Collection}Type helpers into FailureDiagnostic

Author: xedin

lib/Sema/CSDiagnostics.cpp

@@ -1261,12 +1261,11 @@ bool RValueTreatedAsLValueFailure::diagnoseAsError() {
                                                    ParameterTypeFlags())});
 
         if (auto info = getFunctionArgApplyInfo(argLoc)) {
-          auto &cs = getConstraintSystem();
           auto paramType = info->getParamType();
           auto argType = getType(inoutExpr)->getWithoutSpecifierType();
 
           PointerTypeKind ptr;
-          if (cs.isArrayType(argType) &&
+          if (isArrayType(argType) &&
               paramType->getAnyPointerElementType(ptr) &&
               (ptr == PTK_UnsafePointer || ptr == PTK_UnsafeRawPointer)) {
             emitDiagnosticAt(inoutExpr->getLoc(),
@@ -3403,27 +3402,25 @@ bool MissingMemberFailure::diagnoseForDynamicCallable() const {
 }
 
 bool MissingMemberFailure::diagnoseInLiteralCollectionContext() const {
-  auto &cs = getConstraintSystem();
   auto *expr = castToExpr(getAnchor());
-  auto *parentExpr = cs.getParentExpr(expr);
+  auto *parentExpr = findParentExpr(expr);
   auto &solution = getSolution();
 
   if (!(parentExpr && isa<UnresolvedMemberExpr>(expr)))
     return false;
 
   auto parentType = getType(parentExpr);
 
-  if (!cs.isCollectionType(parentType) && !parentType->is<TupleType>())
+  if (!isCollectionType(parentType) && !parentType->is<TupleType>())
     return false;
 
   if (isa<TupleExpr>(parentExpr)) {
-    parentExpr = cs.getParentExpr(parentExpr);
+    parentExpr = findParentExpr(parentExpr);
     if (!parentExpr)
       return false;
   }
 
-  if (auto *defaultableVar =
-          cs.getType(parentExpr)->getAs<TypeVariableType>()) {
+  if (auto *defaultableVar = getType(parentExpr)->getAs<TypeVariableType>()) {
     if (solution.DefaultedConstraints.count(
             defaultableVar->getImpl().getLocator()) != 0) {
       emitDiagnostic(diag::unresolved_member_no_inference, getName());

lib/Sema/CSDiagnostics.h

@@ -202,6 +202,16 @@ class FailureDiagnostic {
       Type type,
       llvm::function_ref<void(GenericTypeParamType *, Type)> substitution =
           [](GenericTypeParamType *, Type) {});
+
+  bool isCollectionType(Type type) const {
+    auto &cs = getConstraintSystem();
+    return bool(cs.isCollectionType(type));
+  }
+
+  bool isArrayType(Type type) const {
+    auto &cs = getConstraintSystem();
+    return bool(cs.isArrayType(type));
+  }
 };
 
 /// Base class for all of the diagnostics related to generic requirement