[CSDiag] Remove diagnoseTypeRequirementFailure and

diagnoseUnresolvedDotExprTypeRequirementFailure.

Author: hborla

lib/Sema/CSDiag.cpp

@@ -652,142 +652,6 @@ bool FailureDiagnosis::diagnoseGeneralOverloadFailure(Constraint *constraint) {
   return true;
 }
 
-static bool
-diagnoseUnresolvedDotExprTypeRequirementFailure(ConstraintSystem &cs,
-                                                Constraint *constraint) {
-  auto &TC = cs.TC;
-
-  auto *locator = constraint->getLocator();
-  if (!locator)
-    return false;
-
-
-  auto reqElt =
-      locator->getLastElementAs<LocatorPathElt::TypeParameterRequirement>();
-  if (!reqElt)
-    return false;
-
-  auto *anchor = locator->getAnchor();
-  if (!anchor)
-    return false;
-
-  auto *UDE = dyn_cast<UnresolvedDotExpr>(anchor);
-  if (!UDE)
-    return false;
-
-  auto ownerType = cs.getType(UDE->getBase());
-  if (!ownerType)
-    return false;
-
-  ownerType = cs.simplifyType(ownerType)->getWithoutSpecifierType();
-  if (ownerType->hasTypeVariable() || ownerType->hasUnresolvedType())
-    return false;
-
-  // If we actually resolved the member to use, use it.
-  auto loc = cs.getConstraintLocator(UDE, ConstraintLocator::Member);
-  auto *member = cs.findResolvedMemberRef(loc);
-  // If the problem is contextual it's diagnosed elsewhere.
-  if (!member || !member->getAsGenericContext())
-    return false;
-
-  auto req = member->getAsGenericContext()
-                 ->getGenericSignature()
-                 ->getRequirements()[reqElt->getIndex()];
-
-  Diag<Type, Type, Type, Type, StringRef> note;
-  switch (req.getKind()) {
-  case RequirementKind::Conformance:
-  case RequirementKind::Layout:
-    return false;
-
-  case RequirementKind::Superclass:
-    note = diag::candidate_types_inheritance_requirement;
-    break;
-
-  case RequirementKind::SameType:
-    note = diag::candidate_types_equal_requirement;
-    break;
-  }
-
-  TC.diagnose(UDE->getLoc(), diag::could_not_find_value_member, ownerType,
-              UDE->getName());
-
-  auto first = cs.simplifyType(constraint->getFirstType());
-  auto second = cs.simplifyType(constraint->getSecondType());
-  auto rawFirstType = req.getFirstType();
-  auto rawSecondType = req.getSecondType();
-
-  TC.diagnose(member, note, first, second, rawFirstType, rawSecondType, "");
-
-  return true;
-}
-
-/// Diagnose problems related to failures in constraints
-/// generated by `openGeneric` which represent different
-/// kinds of type parameter requirements.
-static bool diagnoseTypeRequirementFailure(ConstraintSystem &cs,
-                                           Constraint *constraint) {
-  auto &TC = cs.TC;
-
-  auto *locator = constraint->getLocator();
-  if (!locator)
-    return false;
-
-  auto path = locator->getPath();
-  if (path.empty())
-    return false;
-
-  auto &last = path.back();
-  if (last.getKind() != ConstraintLocator::TypeParameterRequirement)
-    return false;
-
-  auto *anchor = locator->getAnchor();
-  if (!anchor)
-    return false;
-
-  auto ownerType = cs.getType(anchor);
-
-  if (isa<UnresolvedMemberExpr>(anchor))
-    ownerType = cs.getContextualType();
-  else if (auto *UDE = dyn_cast<UnresolvedDotExpr>(anchor))
-    ownerType = cs.getType(UDE->getBase());
-
-  if (!ownerType)
-    return false;
-
-  ownerType = cs.simplifyType(ownerType)->getWithoutSpecifierType();
-  if (ownerType->hasTypeVariable() || ownerType->hasUnresolvedType())
-    return false;
-
-  if (diagnoseUnresolvedDotExprTypeRequirementFailure(cs, constraint))
-    return true;
-
-  auto lhs = cs.simplifyType(constraint->getFirstType());
-  auto rhs = cs.simplifyType(constraint->getSecondType());
-
-  switch (constraint->getKind()) {
-  case ConstraintKind::ConformsTo:
-    TC.diagnose(anchor->getLoc(), diag::type_does_not_conform_owner, ownerType,
-                lhs, rhs);
-    return true;
-
-  case ConstraintKind::Subtype: // superclass
-    TC.diagnose(anchor->getLoc(), diag::type_does_not_inherit, ownerType, lhs,
-                rhs);
-    return true;
-
-  case ConstraintKind::Bind: { // same type
-    TC.diagnose(anchor->getLoc(), diag::types_not_equal, ownerType, lhs, rhs);
-    return true;
-  }
-
-  default:
-    break;
-  }
-
-  return false;
-}
-
 bool FailureDiagnosis::diagnoseGeneralConversionFailure(Constraint *constraint){
   auto anchor = expr;
   bool resolvedAnchorToExpr = false;
@@ -965,9 +829,6 @@ bool FailureDiagnosis::diagnoseGeneralConversionFailure(Constraint *constraint){
     }
   }
 
-  if (diagnoseTypeRequirementFailure(CS, constraint))
-    return true;
-
   diagnose(anchor->getLoc(), diag::types_not_convertible,
            constraint->getKind() == ConstraintKind::Subtype,
            fromType, toType)