Merge pull request #38774 from DougGregor/objc-import-block-without-prototype

Author: swift-ci

lib/ClangImporter/ImportName.cpp

@@ -1316,7 +1316,7 @@ NameImporter::considerAsyncImport(
   // void (^)()), we cannot importer it.
   auto completionHandlerFunctionType =
       completionHandlerParam->getType()->castAs<clang::BlockPointerType>()
-      ->getPointeeType()->getAs<clang::FunctionProtoType>();
+      ->getPointeeType()->getAs<clang::FunctionType>();
   if (!completionHandlerFunctionType)
     return notAsync("block parameter does not have a prototype");
 
@@ -1328,8 +1328,13 @@ NameImporter::considerAsyncImport(
   // nullable NSError type, which would indicate that the async method could
   // throw.
   Optional<unsigned> completionHandlerErrorParamIndex;
-  auto completionHandlerParamTypes =
-      completionHandlerFunctionType->getParamTypes();
+
+  ArrayRef<clang::QualType> completionHandlerParamTypes;
+  if (auto prototype = completionHandlerFunctionType
+          ->getAs<clang::FunctionProtoType>()) {
+    completionHandlerParamTypes = prototype->getParamTypes();
+  }
+
   auto &clangCtx = clangDecl->getASTContext();
   for (unsigned paramIdx : indices(completionHandlerParamTypes)) {
     auto paramType = completionHandlerParamTypes[paramIdx];

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

@@ -24,7 +24,7 @@ typedef void (^CompletionHandler)(NSString * _Nullable, NSString * _Nullable_res
 -(BOOL)findAnswerFailinglyWithError:(NSError * _Nullable * _Nullable)error completion:(void (^)(NSString *_Nullable, NSError * _Nullable))handler __attribute__((swift_name("findAnswerFailingly(completionHandler:)")));
 -(void)findQAndAWithCompletionHandler:(void (^)(NSString *_Nullable_result, NSString *_Nullable answer, NSError * _Nullable))handler;
 -(void)findQuestionableAnswersWithCompletionHandler:(CompletionHandler)handler;
--(void)doSomethingFun:(NSString *)operation then:(void (^)(void))completionHandler;
+-(void)doSomethingFun:(NSString *)operation then:(void (^)())completionHandler;
 -(void)getFortuneAsynchronouslyWithCompletionHandler:(void (^)(NSString *_Nullable, NSError * _Nullable))handler;
 -(void)getMagicNumberAsynchronouslyWithSeed:(NSInteger)seed completionHandler:(void (^)(NSInteger, NSError * _Nullable))handler;
 @property(readwrite) void (^completionHandler)(NSInteger);