Merge pull request swiftlang#34804 from DougGregor/concurrency-import-mirrored-protocols

[Clang importer] Make sure we mirror protocol decls for all names.

Author: DougGregor

lib/ClangImporter/ImportDecl.cpp

@@ -7463,9 +7463,20 @@ void SwiftDeclConverter::importNonOverriddenMirroredMethods(DeclContext *dc,
             Impl.importMirroredDecl(objcMethod, dc, getVersion(), proto)) {
       members.push_back(imported);
 
-      for (auto alternate : Impl.getAlternateDecls(imported))
+      for (auto alternate : Impl.getAlternateDecls(imported)) {
         if (imported->getDeclContext() == alternate->getDeclContext())
           members.push_back(alternate);
+      }
+
+      if (Impl.SwiftContext.LangOpts.EnableExperimentalConcurrency &&
+          !getVersion().supportsConcurrency()) {
+        auto asyncVersion = getVersion().withConcurrency(true);
+        if (auto asyncImport = Impl.importMirroredDecl(
+                objcMethod, dc, asyncVersion, proto)) {
+          if (asyncImport != imported)
+            members.push_back(asyncImport);
+        }
+      }
     }
   }
 }

test/ClangImporter/objc_async.swift

@@ -25,6 +25,8 @@ func testSlowServer(slowServer: SlowServer) async throws {
 
   await slowServer.serverRestart("localhost")
   await slowServer.server("localhost", atPriorityRestart: 0.8)
+
+  _ = await slowServer.allOperations()
 }
 
 func testSlowServerSynchronous(slowServer: SlowServer) {
@@ -36,4 +38,6 @@ func testSlowServerOldSchool(slowServer: SlowServer) {
   slowServer.doSomethingSlow("mail") { i in
     _ = i
   }
+
+  _ = slowServer.allOperations
 }

test/IDE/print_clang_objc_async.swift

@@ -6,7 +6,7 @@
 // REQUIRES: objc_interop
 // REQUIRES: concurrency
 
-// CHECK-LABEL: class SlowServer : NSObject {
+// CHECK-LABEL: class SlowServer : NSObject, ServiceProvider {
 // CHECK-DAG:     func doSomethingSlow(_ operation: String, completionHandler handler: @escaping (Int) -> Void)
 // CHECK-DAG:     func doSomethingSlow(_ operation: String) async -> Int
 // CHECK-DAG:     func doSomethingDangerous(_ operation: String, completionHandler handler: ((String?, Error?) -> Void)? = nil)

test/Inputs/clang-importer-sdk/usr/include/ObjCConcurrency.h

@@ -3,7 +3,12 @@
 
 #pragma clang assume_nonnull begin
 
-@interface SlowServer : NSObject
+@protocol ServiceProvider
+@property(readonly) NSArray<NSString *> *allOperations;
+-(void)allOperationsWithCompletionHandler:(void (^)(NSArray<NSString *> *))completion;
+@end
+
+@interface SlowServer : NSObject <ServiceProvider>
 -(void)doSomethingSlow:(NSString *)operation completionHandler:(void (^)(NSInteger))handler;
 -(void)doSomethingDangerous:(NSString *)operation completionHandler:(void (^ _Nullable)(NSString *_Nullable, NSError * _Nullable))handler;
 -(void)checkAvailabilityWithCompletionHandler:(void (^)(BOOL isAvailable))completionHandler;