Skip to content

Commit d3926d1

Browse files
authored
Revert "AST: Fix excessive deserialization in GenericSignatureBuilder"
1 parent 863dfca commit d3926d1

File tree

5 files changed

+1
-33
lines changed

5 files changed

+1
-33
lines changed

lib/AST/GenericSignatureBuilder.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -554,16 +554,7 @@ auto GenericSignatureBuilder::PotentialArchetype::getNestedType(
554554
SmallVector<std::pair<ProtocolDecl *, RequirementSource>, 4>
555555
conformsTo(rep->ConformsTo.begin(), rep->ConformsTo.end());
556556
for (auto &conforms : conformsTo) {
557-
// Make sure we don't trigger deserialization of extensions,
558-
// since they can refer back to a protocol we're currently
559-
// type checking.
560-
//
561-
// Note that typealiases in extensions won't matter here,
562-
// because a typealias is never going to be a representative
563-
// PA.
564-
auto members = conforms.first->lookupDirect(nestedName,
565-
/*ignoreNewExtensions=*/true);
566-
for (auto member : members) {
557+
for (auto member : conforms.first->lookupDirect(nestedName)) {
567558
PotentialArchetype *pa;
568559

569560
if (auto assocType = dyn_cast<AssociatedTypeDecl>(member)) {

test/Serialization/Inputs/circular-associated-type/a.swift

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/Serialization/Inputs/circular-associated-type/b.swift

Lines changed: 0 additions & 7 deletions
This file was deleted.

test/Serialization/Inputs/circular-associated-type/c.swift

Lines changed: 0 additions & 5 deletions
This file was deleted.

test/Serialization/multi-file-associated-type-circularity.swift

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)