Merge pull request #11003 from swiftlang/feature-availability-protocol

[feature availability] Don't warn about unguarded uses of ObjC protocols adopted by interfaces

Author: nkcsgexi

clang/lib/Sema/SemaExpr.cpp

@@ -369,7 +369,8 @@ bool Sema::DiagnoseUseOfDecl(NamedDecl *D, ArrayRef<SourceLocation> Locs,
   DiagnoseAvailabilityOfDecl(D, Locs, UnknownObjCClass, ObjCPropertyAccess,
                              AvoidPartialAvailabilityChecks, ClassReceiver);
 
-  DiagnoseFeatureAvailabilityOfDecl(D, Locs);
+  if (!AvoidPartialAvailabilityChecks)
+    DiagnoseFeatureAvailabilityOfDecl(D, Locs);
 
   DiagnoseUnusedOfDecl(*this, D, Loc);
 

clang/test/SemaObjC/feature-availability.m

@@ -151,7 +151,7 @@ @interface Base3 <P1>
 @end
 
 __attribute__((availability(domain:feature1, AVAIL)))
-@interface Base4 <P1> // expected-error {{use of 'P1' requires feature 'feature1' to be unavailable}}
+@interface Base4 <P1>
 @end
 
 __attribute__((availability(domain:feature1, AVAIL)))
@@ -170,8 +170,10 @@ @interface Base5(Cat3) <P2>
 @end
 
 __attribute__((availability(domain:feature1, UNAVAIL)))
-@interface Base5(Cat4) <P2> // expected-error {{use of 'P2' requires feature 'feature1' to be available}}
+@interface Base5(Cat4) <P2>
 @end
 
-@interface Base6 <P1, P2> // expected-error {{use of 'P1' requires feature 'feature1' to be unavailable}} expected-error {{use of 'P2' requires feature 'feature1' to be available}}
+@interface Base6 <P1, P2>
 @end
+
+void foo(id<P1>); // expected-error {{use of 'P1' requires feature 'feature1' to be unavailable}}