Merge pull request #12728 from DougGregor/gsb-one-fewer-assoc-type-walk

swift-ci · web-flow · commit 72250cf1f650 · 2017-11-02T15:41:59.000-07:00
diff --git a/lib/AST/GenericSignatureBuilder.cpp b/lib/AST/GenericSignatureBuilder.cpp
@@ -1639,13 +1639,6 @@ bool EquivalenceClass::recordConformanceConstraint(
       // superclass conforms to this protocol.
       (void)builder.resolveSuperConformance(type, proto);
     }
-
-    // Resolve any associated type members.
-    for (auto assocType : proto->getAssociatedTypeMembers()) {
-      type.realizePotentialArchetype(builder)->updateNestedTypeForConformance(
-                                        builder, assocType,
-                                        ArchetypeResolutionKind::AlreadyKnown);
-    }
   }
 
   // Record this conformance source.

Original file line number	Diff line number	Diff line change
`@@ -1639,13 +1639,6 @@ bool EquivalenceClass::recordConformanceConstraint(`
`1639`	`1639`	`// superclass conforms to this protocol.`
`1640`	`1640`	`(void)builder.resolveSuperConformance(type, proto);`
`1641`	`1641`	`}`
`1642`		`-`
`1643`		`- // Resolve any associated type members.`
`1644`		`- for (auto assocType : proto->getAssociatedTypeMembers()) {`
`1645`		`- type.realizePotentialArchetype(builder)->updateNestedTypeForConformance(`
`1646`		`- builder, assocType,`
`1647`		`- ArchetypeResolutionKind::AlreadyKnown);`
`1648`		`- }`
`1649`	`1642`	`}`
`1650`	`1643`
`1651`	`1644`	`// Record this conformance source.`