File tree Expand file tree Collapse file tree 2 files changed +2
-4
lines changed Expand file tree Collapse file tree 2 files changed +2
-4
lines changed Original file line number Diff line number Diff line change @@ -287,7 +287,8 @@ bool ProtocolConformanceRef::hasUnavailableConformance() const {
287287
288288 // Check whether this conformance is on an unavailable extension.
289289 auto concrete = getConcrete ();
290- auto ext = dyn_cast<ExtensionDecl>(concrete->getDeclContext ());
290+ auto *dc = concrete->getRootConformance ()->getDeclContext ();
291+ auto ext = dyn_cast<ExtensionDecl>(dc);
291292 if (ext && AvailableAttr::isUnavailable (ext))
292293 return true ;
293294
Original file line number Diff line number Diff line change @@ -6464,9 +6464,6 @@ ProtocolConformance *swift::deriveImplicitSendableConformance(
64646464 auto inheritedConformance = classModule->checkConformance (
64656465 classDecl->mapTypeIntoContext (superclass),
64666466 proto, /* allowMissing=*/ false );
6467- if (inheritedConformance.hasUnavailableConformance ())
6468- inheritedConformance = ProtocolConformanceRef::forInvalid ();
6469-
64706467 if (inheritedConformance) {
64716468 inheritedConformance = inheritedConformance
64726469 .mapConformanceOutOfContext ();
You can’t perform that action at this time.
0 commit comments