Merge pull request #34725 from aschwaighofer/fix_irgen_swift_task_create

Fix IRGen for swift_task_create after Nate's async function pointer changes

Author: aschwaighofer

include/swift/Runtime/RuntimeFunctions.def

@@ -1497,14 +1497,13 @@ FUNCTION(TaskCancel,
          ARGS(SwiftTaskPtrTy),
          ATTRS(NoUnwind, ArgMemOnly))
 
-// AsyncTaskAndContext swift_task_create_f(
-//     size_t flags, AsyncTask *task, AsyncFunctionType<void()> *function,
-//     size_t initialContextSize);
+// AsyncTaskAndContext swift_task_create(
+//     size_t flags, AsyncTask *task, AsyncFunctionPointer *function);
 FUNCTION(TaskCreateFunc,
-         swift_task_create_f, SwiftCC,
+         swift_task_create, SwiftCC,
          ConcurrencyAvailability,
          RETURNS(AsyncTaskAndContextTy),
-         ARGS(SizeTy, SwiftTaskPtrTy, TaskContinuationFunctionPtrTy, SizeTy),
+         ARGS(SizeTy, SwiftTaskPtrTy, AsyncFunctionPointerPtrTy),
          ATTRS(NoUnwind, ArgMemOnly))
 
 #undef RETURNS

lib/IRGen/GenCall.cpp

@@ -3556,11 +3556,9 @@ llvm::Value *irgen::emitTaskCreate(
   parentTask = IGF.Builder.CreateBitOrPointerCast(
       parentTask, IGF.IGM.SwiftTaskPtrTy);
   taskFunction = IGF.Builder.CreateBitOrPointerCast(
-      taskFunction, IGF.IGM.TaskContinuationFunctionPtrTy);
+      taskFunction, IGF.IGM.AsyncFunctionPointerPtrTy);
 
   // Determine the size of the async context for the closure.
-  // FIXME: If the task function comes in as an AsyncFunctionPointer, we might
-  // want to use swift_task_create instead of swift_task_create_f.
   ASTContext &ctx = IGF.IGM.IRGen.SIL.getASTContext();
   auto extInfo = ASTExtInfoBuilder().withAsync().withThrows().build();
   auto taskFunctionType = FunctionType::get(
@@ -3570,14 +3568,11 @@ llvm::Value *irgen::emitTaskCreate(
   auto layout = getAsyncContextLayout(
       IGF.IGM, taskFunctionCanSILType, taskFunctionCanSILType,
       SubstitutionMap());
-  auto layoutSize = getAsyncContextSize(layout);
-  auto layoutSizeVal = llvm::ConstantInt::get(
-      IGF.IGM.SizeTy, layoutSize.getValue());
 
   // Call the function.
   auto *result = IGF.Builder.CreateCall(
       IGF.IGM.getTaskCreateFuncFn(),
-      { flags, parentTask, taskFunction, layoutSizeVal });
+      { flags, parentTask, taskFunction });
   result->setDoesNotThrow();
   result->setCallingConv(IGF.IGM.SwiftCC);
 

test/IRGen/async/builtins.sil

@@ -34,7 +34,7 @@ sil hidden [ossa] @launch_task : $@convention(method) @async (Int, Optional<Buil
 bb0(%0 : $Int, %1: @unowned $Optional<Builtin.NativeObject>, %2: @guaranteed $@async @callee_guaranteed () -> (@error Error)):
   %3 = begin_borrow %1 : $Optional<Builtin.NativeObject>
   // CHECK: call %swift.refcounted* @swift_retain(%swift.refcounted* returned [[FN_CONTEXT:%.*]])
-  // CHECK: [[NEW_TASK_AND_CONTEXT:%.*]] = call swiftcc %swift.async_task_and_context @swift_task_create_f
+  // CHECK: [[NEW_TASK_AND_CONTEXT:%.*]] = call swiftcc %swift.async_task_and_context @swift_task_create(
   // CHECK-NEXT: [[NEW_CONTEXT_RAW:%.*]] = extractvalue %swift.async_task_and_context [[NEW_TASK_AND_CONTEXT]], 1
   // CHECK-NEXT: [[NEW_CONTEXT:%.*]] = bitcast %swift.context* [[NEW_CONTEXT_RAW]] to
   // CHECK-NEXT: [[CONTEXT_INFO_LOC:%.*]] = getelementptr inbounds <{{.*}}>* [[NEW_CONTEXT]]
@@ -44,4 +44,4 @@ bb0(%0 : $Int, %1: @unowned $Optional<Builtin.NativeObject>, %2: @guaranteed $@a
   destroy_value %20 : $(Builtin.NativeObject, Builtin.RawPointer)
   %21 = tuple ()
   return %21 : $()
-}
+}