---

yaml
---
r: 346750
b: refs/heads/master
c: 53c6ec8
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e48650cc1270740ccb6be5be9b06a45c5cdd9565
+refs/heads/master: 53c6ec8b6bbc9a411f3433ee396d72ab7dff1ec9
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/AST/Decl.cpp

@@ -3383,9 +3383,11 @@ TypeLoc &AssociatedTypeDecl::getDefaultDefinitionLoc() {
 
 SourceRange AssociatedTypeDecl::getSourceRange() const {
   SourceLoc endLoc;
-  if (auto TWC = getTrailingWhereClause())
+  if (auto TWC = getTrailingWhereClause()) {
     endLoc = TWC->getSourceRange().End;
-  else if (!getInherited().empty()) {
+  } else if (getDefaultDefinitionLoc().hasLocation()) {
+    endLoc = getDefaultDefinitionLoc().getSourceRange().End;
+  } else if (!getInherited().empty()) {
     endLoc = getInherited().back().getSourceRange().End;
   } else {
     endLoc = getNameLoc();

trunk/test/IDE/structure.swift

@@ -245,6 +245,12 @@ protocol FooProtocol {
   // CHECK:  <associatedtype>associatedtype <name>Baz</name>: Equatable</associatedtype>
   associatedtype Qux where Qux: Equatable
   // CHECK:  <associatedtype>associatedtype <name>Qux</name> where Qux: Equatable</associatedtype>
+  associatedtype Bar2 = Int
+  // CHECK:  <associatedtype>associatedtype <name>Bar2</name> = Int</associatedtype>
+  associatedtype Baz2: Equatable = Int
+  // CHECK:  <associatedtype>associatedtype <name>Baz2</name>: Equatable = Int</associatedtype>
+  associatedtype Qux2 = Int where Qux2: Equatable
+  // CHECK:  <associatedtype>associatedtype <name>Qux2</name> = Int where Qux2: Equatable</associatedtype>
 }
 
 // CHECK: <struct>struct <name>Generic</name><<generic-param><name>T</name>: <inherited><elem-typeref>Comparable</elem-typeref></inherited></generic-param>, <generic-param><name>X</name></generic-param>> {

trunk/test/SILOptimizer/licm_exclusivity.swift

@@ -5,6 +5,7 @@
 // RUN: %target-swift-frontend -O -enforce-exclusivity=checked -emit-sil  -whole-module-optimization %s | %FileCheck %s --check-prefix=TESTSIL2
 
 // REQUIRES: optimized_stdlib,asserts
+// REQUIRES: PTRSIZE=64
 
 // TEST1-LABEL: Processing loops in {{.*}}run_ReversedArray{{.*}}
 // TEST1: Hoist and Sink pairs attempt