Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

include/swift/AST/Expr.h

@@ -4656,7 +4656,8 @@ class AssignExpr : public Expr {
   }
   SourceLoc getEndLoc() const {
     if (!isFolded()) return EqualLoc;
-    return (Src->getEndLoc().isValid() ? Src->getEndLoc() : Dest->getEndLoc());
+    auto SrcEnd = Src->getEndLoc();
+    return (SrcEnd.isValid() ? SrcEnd : Dest->getEndLoc());
   }
 
   /// True if the node has been processed by binary expression folding.

test/IDE/range_info_54276140.swift

@@ -0,0 +1,6 @@
+// This range info request used to take several minutes to get. Adding a test to make sure we don't lose track of it.
+// RUN: %target-swift-ide-test -range -pos=4:1 -end-pos=4:12 -source-filename %s | %FileCheck %s -check-prefix=CHECK1
+
+all = "ALL"= "GET"= "POST"= "PUT"= "HEAD"= "DELETE"= "OPTIONS"= "TRACE"= "COPY"= "LOCK"= "MKCOL"= "MOVE"= "PURGE"= "PROPFIND"= "PROPPATCH"= "UNLOCK"= "REPORT"= "MKACTIVITY"= "CHECKOUT"= "MERGE"= "MSEARCH"= "NOTIFY"= "SUBSCRIBE"= "UNSUBSCRIBE"= "PATCH"= "SEARCH"= "CONNECT"= "ERROR"= "UNKNOWN"
+
+// CHECK1: <ASTNodes>2</ASTNodes>