---

yaml
---
r: 349419
b: refs/heads/master-next
c: 823113c
h: refs/heads/master
i:
  349417: 633b5bf
  349415: 91b8ad2

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 1e7d0d7aed0d7b46465f4ea66e44a2354176fc40
+refs/heads/master-next: 823113c1ff5dd6845f49f8471609a4bea3ccb989
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/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.

branches/master-next/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>