[NameLookup] Lift synthesized protocol check into getDirectlyInheritedNominalTypeDecls

Some places use `getDirectlyInheritedNominalTypeDecls` directly
instead of fetching it through a request, so lift the check there
instead (direct use of `getDirectlyInheritedNominalTypeDecls`
could be refactored separately).

Author: xedin

lib/AST/NameLookup.cpp

@@ -3187,20 +3187,12 @@ ArrayRef<ProtocolDecl *>
 InheritedProtocolsRequest::evaluate(Evaluator &evaluator,
                                     ProtocolDecl *PD) const {
   llvm::SmallSetVector<ProtocolDecl *, 2> inherited;
-  auto addInherited = [&inherited, &PD](ProtocolDecl *P) {
-    if (PD != P)
-      inherited.insert(P);
-  };
-
-  for (auto attr : PD->getAttrs().getAttributes<SynthesizedProtocolAttr>()) {
-    addInherited(attr->getProtocol());
-  }
-
   bool anyObject = false;
-  for (const auto &found : getDirectlyInheritedNominalTypeDecls(PD, anyObject)) {
-    if (auto proto = dyn_cast<ProtocolDecl>(found.Item)) {
-      addInherited(proto);
-    }
+  for (const auto &found :
+       getDirectlyInheritedNominalTypeDecls(PD, anyObject)) {
+    auto proto = dyn_cast<ProtocolDecl>(found.Item);
+    if (proto && proto != PD)
+      inherited.insert(proto);
   }
 
   return PD->getASTContext().AllocateCopy(inherited.getArrayRef());
@@ -3718,6 +3710,16 @@ swift::getDirectlyInheritedNominalTypeDecls(
     return result;
   }
 
+  // Check for SynthesizedProtocolAttrs on the protocol. ClangImporter uses
+  // these to add `Sendable` conformances to protocols without modifying the
+  // inherited type list.
+  for (auto attr :
+       protoDecl->getAttrs().getAttributes<SynthesizedProtocolAttr>()) {
+    auto loc = attr->getLocation();
+    result.push_back(
+        {attr->getProtocol(), loc, attr->isUnchecked() ? loc : SourceLoc()});
+  }
+
   // Else we have access to this information on the where clause.
   auto selfBounds = getSelfBoundsFromWhereClause(decl);
   anyObject |= selfBounds.anyObject;

test/Concurrency/sendable_objc_protocol_attr.swift

@@ -22,6 +22,9 @@ NS_SWIFT_SENDABLE
 @property (readonly, nonatomic) NSString *test;
 @end
 
+@protocol MyRefinedObjCProtocol <MyObjCProtocol>
+@end
+
 #pragma clang assume_nonnull end
 
 //--- main.swift
@@ -38,3 +41,30 @@ extension MyObjCProtocol {
     compute() // Ok
   }
 }
+
+class K : NSObject, MyObjCProtocol {
+  // expected-warning@-1 {{non-final class 'K' cannot conform to 'Sendable'; use '@unchecked Sendable'}}
+  let test: String = "k"
+}
+
+class UncheckedK : NSObject, MyObjCProtocol, @unchecked Sendable { // ok
+  let test: String = "unchecked"
+}
+
+class KRefined : NSObject, MyRefinedObjCProtocol {
+  // expected-warning@-1 {{non-final class 'KRefined' cannot conform to 'Sendable'; use '@unchecked Sendable'}}
+  let test: String = "refined"
+}
+
+class KUncheckedRefined : NSObject, MyRefinedObjCProtocol, @unchecked Sendable { // Ok
+  let test: String = "refined unchecked"
+}
+
+do {
+  func testSendable<T: Sendable>(_: T) {}
+
+  testSendable(K()) // Ok
+  testSendable(UncheckedK()) // Ok
+  testSendable(KRefined()) // Ok
+  testSendable(KUncheckedRefined()) // Ok
+}