[GSB] Remove getColonLoc() and getEqualLoc() in favour of getSeparatorLoc()

Most callers aren't concerned about the difference between the two (and those that are are already exercising the appropriate assertions with e.g the use of `getFirstType()`).

Author: hamishknight

include/swift/AST/Decl.h

@@ -1149,14 +1149,6 @@ class RequirementRepr {
     return SecondLayout;
   }
 
-  /// \brief Retrieve the location of the ':' in an explicitly-written
-  /// conformance requirement.
-  SourceLoc getColonLoc() const {
-    assert(getKind() == RequirementReprKind::TypeConstraint ||
-           getKind() == RequirementReprKind::LayoutConstraint);
-    return SeparatorLoc;
-  }
-
   /// \brief Retrieve the first type of a same-type requirement.
   Type getFirstType() const {
     assert(getKind() == RequirementReprKind::SameType);
@@ -1199,10 +1191,9 @@ class RequirementRepr {
     return SecondType;
   }
 
-  /// \brief Retrieve the location of the '==' in an explicitly-written
-  /// same-type requirement.
-  SourceLoc getEqualLoc() const {
-    assert(getKind() == RequirementReprKind::SameType);
+  /// \brief Retrieve the location of the ':' or '==' in an explicitly-written
+  /// conformance or same-type requirement respectively.
+  SourceLoc getSeparatorLoc() const {
     return SeparatorLoc;
   }
 

lib/AST/Decl.cpp

@@ -614,7 +614,7 @@ GenericParamList::clone(DeclContext *dc) const {
       auto second = reqt.getConstraintLoc();
       reqt = RequirementRepr::getTypeConstraint(
           first.clone(ctx),
-          reqt.getColonLoc(),
+          reqt.getSeparatorLoc(),
           second.clone(ctx));
       break;
     }
@@ -623,7 +623,7 @@ GenericParamList::clone(DeclContext *dc) const {
       auto second = reqt.getSecondTypeLoc();
       reqt = RequirementRepr::getSameType(
           first.clone(ctx),
-          reqt.getEqualLoc(),
+          reqt.getSeparatorLoc(),
           second.clone(ctx));
       break;
     }
@@ -632,7 +632,7 @@ GenericParamList::clone(DeclContext *dc) const {
       auto layout = reqt.getLayoutConstraintLoc();
       reqt = RequirementRepr::getLayoutConstraint(
           first.clone(ctx),
-          reqt.getColonLoc(),
+          reqt.getSeparatorLoc(),
           layout);
       break;
     }

lib/AST/GenericSignatureBuilder.cpp

@@ -1451,16 +1451,9 @@ SourceLoc RequirementSource::getLoc() const {
   if (auto typeRepr = getTypeRepr())
     return typeRepr->getStartLoc();
 
-  if (auto requirementRepr = getRequirementRepr()) {
-    switch (requirementRepr->getKind()) {
-    case RequirementReprKind::LayoutConstraint:
-    case RequirementReprKind::TypeConstraint:
-      return requirementRepr->getColonLoc();
+  if (auto requirementRepr = getRequirementRepr())
+    return requirementRepr->getSeparatorLoc();
 
-    case RequirementReprKind::SameType:
-      return requirementRepr->getEqualLoc();
-    }
-  }
   if (parent)
     return parent->getLoc();
 
@@ -1678,24 +1671,14 @@ const RequirementSource *FloatingRequirementSource::getSource(
 }
 
 SourceLoc FloatingRequirementSource::getLoc() const {
-  auto getSeparatorLoc = [](const RequirementRepr *req) -> SourceLoc {
-    switch (req->getKind()) {
-    case RequirementReprKind::LayoutConstraint:
-    case RequirementReprKind::TypeConstraint:
-      return req->getColonLoc();
-    case RequirementReprKind::SameType:
-      return req->getEqualLoc();
-    }
-  };
-
   // For an explicit abstract protocol source, we can get a more accurate source
   // location from the written protocol requirement.
   if (kind == Kind::AbstractProtocol && isExplicit()) {
     auto written = protocolReq.written;
     if (auto typeRepr = written.dyn_cast<const TypeRepr *>())
       return typeRepr->getLoc();
     if (auto requirementRepr = written.dyn_cast<const RequirementRepr *>())
-      return getSeparatorLoc(requirementRepr);
+      return requirementRepr->getSeparatorLoc();
   }
 
   if (auto source = storage.dyn_cast<const RequirementSource *>())
@@ -1705,7 +1688,7 @@ SourceLoc FloatingRequirementSource::getLoc() const {
     return typeRepr->getLoc();
 
   if (auto requirementRepr = storage.dyn_cast<const RequirementRepr *>())
-    return getSeparatorLoc(requirementRepr);
+    return requirementRepr->getSeparatorLoc();
 
   return SourceLoc();
 }
@@ -5357,7 +5340,7 @@ GenericSignatureBuilder::addRequirement(const Requirement &req,
         !req.getSecondType()->hasTypeParameter() &&
         !req.getFirstType()->hasError() &&
         !req.getSecondType()->hasError()) {
-      Diags.diagnose(reqRepr->getEqualLoc(),
+      Diags.diagnose(reqRepr->getSeparatorLoc(),
                      diag::requires_no_same_type_archetype,
                      req.getFirstType(), req.getSecondType())
         .highlight(reqRepr->getFirstTypeLoc().getSourceRange())

lib/Sema/TypeCheckProtocol.cpp

@@ -2674,11 +2674,11 @@ void ConformanceChecker::checkNonFinalClassWitness(ValueDecl *requirement,
       emitDeclaredHereIfNeeded(diags, diagLoc, witness);
 
       if (auto requirementRepr = *constraint) {
-        diags.diagnose(requirementRepr->getEqualLoc(),
+        diags.diagnose(requirementRepr->getSeparatorLoc(),
                        diag::witness_self_weaken_same_type,
                        requirementRepr->getFirstType(),
                        requirementRepr->getSecondType())
-          .fixItReplace(requirementRepr->getEqualLoc(), ":");
+          .fixItReplace(requirementRepr->getSeparatorLoc(), ":");
       }
     }
   }