---

yaml
---
r: 345009
b: refs/heads/master
c: 3b17a09
h: refs/heads/master
i:
  345007: e7533c6

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8720c8ce9d90b53cd40cf8182ee72ea8ac88f0cc
+refs/heads/master: 3b17a0931282847a26cf939317d2111a3857dfa2
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/SIL/SILWitnessVisitor.h

@@ -61,7 +61,10 @@ template <class T> class SILWitnessVisitor : public ASTVisitor<T> {
       SmallVector<AssociatedTypeDecl *, 2> associatedTypes;
       for (Decl *member : protocol->getMembers()) {
         if (auto associatedType = dyn_cast<AssociatedTypeDecl>(member)) {
-          associatedTypes.push_back(associatedType);
+          // If this is a new associated type (which does not override an
+          // existing associated type), add it.
+          if (associatedType->getOverriddenDecls().empty())
+            associatedTypes.push_back(associatedType);
         }
       }
 
@@ -70,7 +73,6 @@ template <class T> class SILWitnessVisitor : public ASTVisitor<T> {
                            TypeDecl::compare);
 
       for (auto *associatedType : associatedTypes) {
-        // TODO: only add associated types when they're new?
         asDerived().addAssociatedType(AssociatedType(associatedType));
       }
     };

trunk/test/IRGen/generic_structs.sil

@@ -262,7 +262,7 @@ struct GenericLayoutWithAssocType<T: ParentHasAssociatedType> {
 // CHECK: [[T4:%.*]] = call swiftcc %swift.metadata_response [[T3]](i64 0, %swift.type* %T, i8** [[T1]])
 // CHECK: %T.Assoc = extractvalue %swift.metadata_response [[T4]], 0
 
-// CHECK:   [[T0:%.*]] = getelementptr inbounds i8*, i8** %T.ParentHasAssociatedType, i32 3
+// CHECK:   [[T0:%.*]] = getelementptr inbounds i8*, i8** %T.ParentHasAssociatedType, i32 2
 // CHECK:   [[T1:%.*]] = load i8*, i8** [[T0]],
 // CHECK:   [[T2:%.*]] = bitcast i8* [[T1]] to i8** (%swift.type*, %swift.type*, i8**)*
 // CHECK:   %T.Assoc.HasAssociatedType = call swiftcc i8** [[T2]](%swift.type* %T.Assoc, %swift.type* %T, i8** %T.ParentHasAssociatedType)

trunk/test/SILGen/witnesses_refinement.swift

@@ -13,3 +13,44 @@ extension Int: Saturable {
 // CHECK-NOT: sil_witness_table Int: Equatable module witnesses_refinement { 
 // CHECK-NOT: sil_witness_table Int: Comparable module witnesses_refinement { 
 // CHECK: sil_witness_table hidden Int: Saturable module witnesses_refinement { 
+
+protocol P { }
+
+protocol P0 {
+  associatedtype A
+}
+
+protocol P1 {
+  associatedtype A
+}
+
+protocol P2: P0 {
+  associatedtype A
+}
+
+protocol P3: P2, P1 {
+  associatedtype A: P
+}
+
+struct ConformsToP: P { }
+
+// CHECK-LABEL: sil_witness_table hidden ConformsToP3: P3
+// CHECK:         base_protocol P1
+// CHECK-NEXT:    base_protocol P2
+// CHECK-NEXT:    associated_type_protocol (A: P)
+// CHECK-NEXT:   }
+struct ConformsToP3: P3 {
+  typealias A = ConformsToP
+}
+
+// CHECK-LABEL: sil_witness_table hidden ConformsToP3: P2
+// CHECK:         base_protocol P0
+// CHECK-NEXT:   }
+
+// CHECK-LABEL: sil_witness_table hidden ConformsToP3: P1
+// CHECK:         associated_type A: ConformsToP
+// CHECK-NEXT:   }
+
+// CHECK-LABEL: sil_witness_table hidden ConformsToP3: P0
+// CHECK:         associated_type A: ConformsToP
+// CHECK-NEXT:   }