Merge pull request #80606 from nate-chandler/cherrypick/release/6.2/rdar148760489

6.2: [IRGen] Fix type of deleted coro error func.

Author: nate-chandler

lib/IRGen/GenMeta.cpp

@@ -4625,7 +4625,7 @@ namespace {
         } else if (accessor && requiresFeatureCoroutineAccessors(
                                    accessor->getAccessorKind())) {
           ptr = llvm::ConstantExpr::getBitCast(
-              IGM.getDeletedCalleeAllocatedCoroutineMethodErrorAsyncFunctionPointer(),
+              IGM.getDeletedCalleeAllocatedCoroutineMethodErrorCoroFunctionPointer(),
               IGM.FunctionPtrTy);
         } else {
           ptr = llvm::ConstantExpr::getBitCast(IGM.getDeletedMethodErrorFn(),

lib/IRGen/GenProto.cpp

@@ -1680,7 +1680,7 @@ class AccessorConformanceInfo : public ConformanceInfo {
               IGM.FunctionPtrTy);
         } else if (isCalleeAllocatedCoroutineRequirement) {
           witness = llvm::ConstantExpr::getBitCast(
-              IGM.getDeletedCalleeAllocatedCoroutineMethodErrorAsyncFunctionPointer(),
+              IGM.getDeletedCalleeAllocatedCoroutineMethodErrorCoroFunctionPointer(),
               IGM.CoroFunctionPointerPtrTy);
         } else {
           witness = llvm::ConstantExpr::getBitCast(

lib/IRGen/IRGenModule.cpp

@@ -1234,9 +1234,9 @@ llvm::Constant *IRGenModule::getDeletedAsyncMethodErrorAsyncFunctionPointer() {
 }
 
 llvm::Constant *IRGenModule::
-    getDeletedCalleeAllocatedCoroutineMethodErrorAsyncFunctionPointer() {
+    getDeletedCalleeAllocatedCoroutineMethodErrorCoroFunctionPointer() {
   return getAddrOfLLVMVariableOrGOTEquivalent(
-             LinkEntity::forKnownAsyncFunctionPointer(
+             LinkEntity::forKnownCoroFunctionPointer(
                  "swift_deletedCalleeAllocatedCoroutineMethodError"))
       .getValue();
 }

lib/IRGen/IRGenModule.h

@@ -1538,7 +1538,7 @@ class IRGenModule {
   llvm::AttributeList getAllocAttrs();
   llvm::Constant *getDeletedAsyncMethodErrorAsyncFunctionPointer();
   llvm::Constant *
-  getDeletedCalleeAllocatedCoroutineMethodErrorAsyncFunctionPointer();
+  getDeletedCalleeAllocatedCoroutineMethodErrorCoroFunctionPointer();
 
 private:
   llvm::Constant *EmptyTupleMetadata = nullptr;