Merge pull request #82447 from slavapestov/fix-rdar152509409-6.2

[6.2] AST: Tweak ConformanceLookupTable::compareConformances() some more

Author: slavapestov

lib/AST/ConformanceLookupTable.cpp

@@ -615,9 +615,10 @@ ConformanceLookupTable::Ordering ConformanceLookupTable::compareConformances(
       rhs->getDeclContext()->isAlwaysAvailableConformanceContext()) {
     // Diagnose conflicting marker protocol conformances that differ in
     // un-availability.
-    diagnoseSuperseded = (lhs->getProtocol()->isMarkerProtocol() &&
-                          isUnavailable(lhs->getDeclContext()) !=
-                          isUnavailable(rhs->getDeclContext()));
+    diagnoseSuperseded =
+      (lhs->getProtocol()->isMarkerProtocol() &&
+       isUnavailable(lhs->getDeclContext()) != isUnavailable(rhs->getDeclContext()) &&
+       (lhsKind != ConformanceEntryKind::Implied || rhsKind != ConformanceEntryKind::Implied));
 
     return (lhs->getDeclContext()->isAlwaysAvailableConformanceContext()
             ? Ordering::Before

test/Sema/conformance_availability_implied.swift

@@ -57,3 +57,12 @@ extension Conformer2: Derived1 {
 extension Conformer2: Derived2 {
   func f() {} // expected-note {{'f()' declared here}}
 }
+
+protocol P: MarkerBase {}
+
+struct Conformer3: P {}
+
+@available(*, unavailable)
+extension Conformer3: MarkerDerived1 {}
+
+takesMarkerBase(Conformer3.self)