@@ -7717,29 +7717,6 @@ static void finishTypeWitnesses(
7717
7717
}
7718
7718
}
7719
7719
7720
- // / Make sure any inherited conformances also get completed, if necessary.
7721
- static void finishInheritedConformances (
7722
- NormalProtocolConformance *conformance) {
7723
- auto *proto = conformance->getProtocol ();
7724
-
7725
- SmallVector<ProtocolDecl *, 2 > inheritedProtos;
7726
- for (auto *inherited : proto->getInheritedProtocols ())
7727
- inheritedProtos.push_back (inherited);
7728
-
7729
- // Sort for deterministic import.
7730
- ProtocolType::canonicalizeProtocols (inheritedProtos);
7731
-
7732
- // Schedule any that aren't complete.
7733
- for (auto *inherited : inheritedProtos) {
7734
- ModuleDecl *M = conformance->getDeclContext ()->getParentModule ();
7735
- auto inheritedConformance = M->lookupConformance (conformance->getType (),
7736
- inherited);
7737
- assert (inheritedConformance && inheritedConformance->isConcrete () &&
7738
- " inherited conformance not found" );
7739
- (void )inheritedConformance;
7740
- }
7741
- }
7742
-
7743
7720
// / A stripped-down version of Type::subst that only works on non-generic
7744
7721
// / associated types.
7745
7722
// /
@@ -7837,7 +7814,6 @@ void ClangImporter::Implementation::finishNormalConformance(
7837
7814
conformance);
7838
7815
7839
7816
finishTypeWitnesses (conformance);
7840
- finishInheritedConformances (conformance);
7841
7817
finishSignatureConformances (conformance);
7842
7818
7843
7819
// Imported conformances to @objc protocols also require additional
0 commit comments