Fixes for review

Author: David Ungar

include/swift/AST/Decl.h

@@ -2919,8 +2919,8 @@ class TypeAliasDecl : public GenericTypeDecl {
   /// The location of the equal '=' token
   SourceLoc EqualLoc;
 
-  /// The end of the type
-  SourceLoc EndLoc;
+  /// The end of the type, valid even when the type cannot be parsed
+  SourceLoc TypeEndLoc;
 
   /// The location of the right-hand side of the typealias binding
   TypeLoc UnderlyingTy;
@@ -2938,7 +2938,7 @@ class TypeAliasDecl : public GenericTypeDecl {
     return EqualLoc;
   }
 
-  void setEndLoc(SourceLoc e) { EndLoc = e; }
+  void setTypeEndLoc(SourceLoc e) { TypeEndLoc = e; }
 
   TypeLoc &getUnderlyingTypeLoc() {
     return UnderlyingTy;

lib/AST/Decl.cpp

@@ -3503,7 +3503,9 @@ SourceRange TypeAliasDecl::getSourceRange() const {
     return { TypeAliasLoc, TrailingWhereClauseSourceRange.End };
   if (UnderlyingTy.hasLocation())
     return { TypeAliasLoc, UnderlyingTy.getSourceRange().End };
-  return {TypeAliasLoc, EndLoc};
+  if (TypeEndLoc.isValid())
+    return { TypeAliasLoc, TypeEndLoc };
+  return { TypeAliasLoc, getNameLoc() };
 }
 
 void TypeAliasDecl::setUnderlyingType(Type underlying) {

lib/Parse/ParseDecl.cpp

@@ -4098,7 +4098,7 @@ parseDeclTypeAlias(Parser::ParseDeclOptions Flags, DeclAttributes &Attributes) {
     }
 
     UnderlyingTy = parseType(diag::expected_type_in_typealias);
-    TAD->setEndLoc(getEndOfPreviousLoc());
+    TAD->setTypeEndLoc(PreviousLoc);
     Status |= UnderlyingTy;
   }
 
@@ -6394,7 +6394,6 @@ Parser::parseDeclSubscript(SourceLoc StaticLoc,
     SignatureHasCodeCompletion |= whereStatus.hasCodeCompletion();
     if (whereStatus.hasCodeCompletion() && !CodeCompletion) {
       // Trigger delayed parsing, no need to continue.
-      Subscript->setEndLoc(getEndOfPreviousLoc().getAdvancedLoc(-1));
       return whereStatus;
     }
   }
@@ -6429,6 +6428,9 @@ Parser::parseDeclSubscript(SourceLoc StaticLoc,
                           accessors, Subscript, StaticLoc);
   }
 
+  // Now that it's been parsed, set the end location.
+  Subscript->setEndLoc(PreviousLoc);
+
   bool Invalid = false;
   // Reject 'subscript' functions outside of type decls
   if (!(Flags & PD_HasContainerType)) {
@@ -6438,8 +6440,6 @@ Parser::parseDeclSubscript(SourceLoc StaticLoc,
 
   accessors.record(*this, Subscript, (Invalid || !Status.isSuccess()), Decls);
 
-  Subscript->setEndLoc(getEndOfPreviousLoc().getAdvancedLoc(-1));
-
   // No need to setLocalDiscriminator because subscripts cannot
   // validly appear outside of type decls.
   return makeParserResult(Status, Subscript);