improve location tracking of SuppressedEntry

Author: kavon

include/swift/AST/Decl.h

@@ -1466,10 +1466,17 @@ struct InheritedEntry : public TypeLoc {
 
 /// An entry in the "suppressed conformance" list of a type.
 struct SuppressedEntry : public TypeLoc {
-  SourceLoc WithoutLoc; // location of the "without" operator on this type.
+  SourceRange WithoutRange; // location of the "without" operator on this type.
 
-  SuppressedEntry(const TypeLoc &typeLoc, SourceLoc withoutLoc)
-      : TypeLoc(typeLoc), WithoutLoc(withoutLoc) {}
+  SuppressedEntry(const TypeLoc &typeLoc, SourceRange withoutRange)
+      : TypeLoc(typeLoc), WithoutRange(withoutRange) {}
+
+  SourceLoc getLoc() const;
+  SourceRange getSourceRange() const;
+
+  SourceRange getWithoutRange() const { return WithoutRange; }
+
+  bool hasLocation() const { return (bool)getLoc(); }
 };
 
 /// ExtensionDecl - This represents a type extension containing methods

lib/AST/Decl.cpp

@@ -1482,6 +1482,19 @@ InheritedEntry::InheritedEntry(const TypeLoc &typeLoc)
     isUnchecked = typeRepr->findUncheckedAttrLoc().isValid();
 }
 
+SourceLoc SuppressedEntry::getLoc() const {
+  return WithoutRange.Start;
+}
+
+SourceRange SuppressedEntry::getSourceRange() const {
+  auto range = TypeLoc::getSourceRange();
+  if (!range)
+    return WithoutRange;
+
+  range.widen(WithoutRange);
+  return range;
+}
+
 ExtensionDecl::ExtensionDecl(SourceLoc extensionLoc,
                              TypeRepr *extendedType,
                              ArrayRef<InheritedEntry> inherited,

lib/Parse/ParseDecl.cpp

@@ -5735,14 +5735,14 @@ ParserStatus Parser::parseInheritance(
     }
 
     // parse the "without" operator
-    SourceLoc withoutLoc;
+    SourceRange withoutLoc;
     if (Tok.isTilde()) {
       auto loc = consumeToken();
 
       if (!options.contains(PI_AllowSuppression))
         diagnose(loc, diag::suppress_illegal_here);
       else
-        withoutLoc = loc;
+        withoutLoc = SourceRange(loc, loc);
     }
 
     auto ParsedTypeResult = parseType();