---

yaml
---
r: 326299
b: refs/heads/master-next
c: 5d87a66
h: refs/heads/master
i:
  326297: 6cc6d4d
  326295: 2fd8e11

Author: David Ungar

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: e052da7d8886fa0439677852e8f7830b20c2e1da
-refs/heads/master-next: 3c891f95320e780defbac0c86bba3ad595b3ce0b
+refs/heads/master-next: 5d87a66edae4b54dbe1853e56614e636f33e0129
 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/lib/AST/ASTScopeSourceRange.cpp

@@ -309,7 +309,12 @@ SourceRange GenericTypeOrExtensionWholePortion::getChildlessSourceRangeOf(
 
 SourceRange
 ExtensionScope::moveStartPastExtendedNominal(const SourceRange sr) const {
-  return SourceRange(getLocAfterExtendedNominal(decl), sr.End);
+  const auto start = getLocAfterExtendedNominal(decl);
+  // Illegal code can have an endLoc that is before the end of the
+  // ExtendedNominal, so push the end back, too, in that case.
+  const auto end =
+      getSourceManager().isBeforeInBuffer(sr.End, start) ? start : sr.End;
+  return SourceRange(start, end);
 }
 
 SourceRange