Merge pull request swiftlang#7527 from apple/revert-7513-circular-des…

…erialization-fix
Ajisaputrars · Feb 16, 2017 · 63d2ac9 · 63d2ac9
2 parents 901b73e + d3926d1
commit 63d2ac9
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 33 deletions.
diff --git a/lib/AST/GenericSignatureBuilder.cpp b/lib/AST/GenericSignatureBuilder.cpp
@@ -554,16 +554,7 @@ auto GenericSignatureBuilder::PotentialArchetype::getNestedType(
   SmallVector<std::pair<ProtocolDecl *, RequirementSource>, 4>
     conformsTo(rep->ConformsTo.begin(), rep->ConformsTo.end());
   for (auto &conforms : conformsTo) {
-    // Make sure we don't trigger deserialization of extensions,
-    // since they can refer back to a protocol we're currently
-    // type checking.
-    //
-    // Note that typealiases in extensions won't matter here,
-    // because a typealias is never going to be a representative
-    // PA.
-    auto members = conforms.first->lookupDirect(nestedName,
-                                                /*ignoreNewExtensions=*/true);
-    for (auto member : members) {
+    for (auto member : conforms.first->lookupDirect(nestedName)) {
       PotentialArchetype *pa;
 
       if (auto assocType = dyn_cast<AssociatedTypeDecl>(member)) {

diff --git a/test/Serialization/Inputs/circular-associated-type/a.swift b/test/Serialization/Inputs/circular-associated-type/a.swift
diff --git a/test/Serialization/Inputs/circular-associated-type/b.swift b/test/Serialization/Inputs/circular-associated-type/b.swift
diff --git a/test/Serialization/Inputs/circular-associated-type/c.swift b/test/Serialization/Inputs/circular-associated-type/c.swift
diff --git a/test/Serialization/multi-file-associated-type-circularity.swift b/test/Serialization/multi-file-associated-type-circularity.swift