Remove CreateAsyncTaskFuture and swift_task_create_future.

DougGregor · DougGregor · commit ccfc9d67f8b9 · 2021-06-23T22:17:38.000-07:00
We no longer need these entry points.
diff --git a/include/swift/AST/Builtins.def b/include/swift/AST/Builtins.def
@@ -805,17 +805,6 @@ BUILTIN_MISC_OPERATION_WITH_SILGEN(EndAsyncLet, "endAsyncLet", "", Special)
 BUILTIN_MISC_OPERATION_WITH_SILGEN(CreateAsyncTask,
     "createAsyncTask", "", Special)
 
-/// createAsyncTaskFuture(): (
-///     Int,                            // flags
-///     Builtin.RawPointer?,            // options (TaskOptionRecord*)
-///     @escaping () async throws -> T  // function
-/// ) -> Builtin.NativeObject
-///
-/// Create a new asynchronous task future, given flags, an (optional) parent
-/// task and a function to execute.
-BUILTIN_MISC_OPERATION_WITH_SILGEN(CreateAsyncTaskFuture,
-    "createAsyncTaskFuture", "", Special)
-
 /// createAsyncTaskGroupFuture(): (
 ///     Int,                            // flags
 ///     Builtin.RawPointer?,            // group
diff --git a/include/swift/Runtime/Concurrency.h b/include/swift/Runtime/Concurrency.h
@@ -67,14 +67,6 @@ AsyncTaskAndContext swift_task_create_common(
     FutureAsyncSignature::FunctionType *function, void *closureContext,
     size_t initialContextSize);
 
-/// Create a task object with a future which will run the given closure.
-SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
-AsyncTaskAndContext swift_task_create_future(
-    size_t flags,
-    TaskOptionRecord *options,
-    const Metadata *futureResultType,
-    void *closureEntryPoint, HeapObject * /* +1 */ closureContext);
-
 /// Create a task object with a future which will run the given
 /// closure, and offer its result to the task group
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
diff --git a/include/swift/Runtime/RuntimeFunctions.def b/include/swift/Runtime/RuntimeFunctions.def
@@ -1547,22 +1547,6 @@ FUNCTION(TaskCancel,
          ARGS(SwiftTaskPtrTy),
          ATTRS(NoUnwind, ArgMemOnly))
 
-// AsyncTaskAndContext swift_task_create_future(
-//     size_t flags,
-//     TaskOptionRecord *options,
-//     const Metadata *futureResultType,
-//     void *closureEntry, HeapObject *closureContext);
-FUNCTION(TaskCreateFuture,
-         swift_task_create_future, SwiftCC,
-         ConcurrencyAvailability,
-         RETURNS(AsyncTaskAndContextTy),
-         ARGS(SizeTy,
-              SwiftTaskOptionRecordPtrTy,
-              TypeMetadataPtrTy,
-              Int8PtrTy,
-              RefCountedPtrTy),
-         ATTRS(NoUnwind, ArgMemOnly))
-
 // AsyncTaskAndContext swift_task_create_group_future(
 //     size_t flags,
 //     TaskGroup *group,
diff --git a/lib/AST/Builtins.cpp b/lib/AST/Builtins.cpp
@@ -2744,7 +2744,6 @@ ValueDecl *swift::getBuiltinValueDecl(ASTContext &Context, Identifier Id) {
     return getCancelAsyncTask(Context, Id);
 
   case BuiltinValueKind::CreateAsyncTask:
-  case BuiltinValueKind::CreateAsyncTaskFuture:
     return getCreateAsyncTask(Context, Id);
 
   case BuiltinValueKind::CreateAsyncTaskGroupFuture:
diff --git a/lib/IRGen/GenBuiltin.cpp b/lib/IRGen/GenBuiltin.cpp
@@ -271,7 +271,6 @@ void irgen::emitBuiltinCall(IRGenFunction &IGF, const BuiltinInfo &Builtin,
   }
 
   if (Builtin.ID == BuiltinValueKind::CreateAsyncTask ||
-      Builtin.ID == BuiltinValueKind::CreateAsyncTaskFuture ||
       Builtin.ID == BuiltinValueKind::CreateAsyncTaskGroupFuture) {
 
     auto flags = args.claimNext();
@@ -286,7 +285,6 @@ void irgen::emitBuiltinCall(IRGenFunction &IGF, const BuiltinInfo &Builtin,
 
     auto newTaskAndContext = emitTaskCreate(
         IGF,
-        Builtin.ID == BuiltinValueKind::CreateAsyncTask,
         flags,
         taskGroup,
         taskOptions,
diff --git a/lib/IRGen/GenCall.cpp b/lib/IRGen/GenCall.cpp
@@ -3858,7 +3858,6 @@ void irgen::emitTaskCancel(IRGenFunction &IGF, llvm::Value *task) {
 
 llvm::Value *irgen::emitTaskCreate(
     IRGenFunction &IGF,
-    bool isCreateAsyncTask,
     llvm::Value *flags,
     llvm::Value *taskGroup,
     llvm::Value *taskOptions,
@@ -3881,8 +3880,7 @@ llvm::Value *irgen::emitTaskCreate(
          taskFunction, localContextInfo});
   } else if (futureResultType) {
     result = IGF.Builder.CreateCall(
-      isCreateAsyncTask ? IGF.IGM.getTaskCreateFn()
-                        : IGF.IGM.getTaskCreateFutureFn(),
+      IGF.IGM.getTaskCreateFn(),
       {flags,
        taskOptions,
        futureResultType,
diff --git a/lib/IRGen/GenCall.h b/lib/IRGen/GenCall.h
@@ -224,14 +224,10 @@ namespace irgen {
 
   void emitTaskCancel(IRGenFunction &IGF, llvm::Value *task);
 
-  /// Emit a class to swift_task_create[_f] or swift_task_create_future[__f]
-  /// with the given flags, parent task, and task function.
-  ///
-  /// When \c futureResultType is non-null, calls the future variant to create
-  /// a future.
+  /// Emit a call to swift_task_create[_f] with the given flags, options, and
+  /// task function.
   llvm::Value *emitTaskCreate(
     IRGenFunction &IGF,
-    bool isCreateAsyncTask,
     llvm::Value *flags,
     llvm::Value *taskGroup,
     llvm::Value *taskOptions,
diff --git a/lib/SIL/IR/OperandOwnership.cpp b/lib/SIL/IR/OperandOwnership.cpp
@@ -770,20 +770,6 @@ OperandOwnershipBuiltinClassifier::visitCreateAsyncTask(BuiltinInst *bi,
   return OperandOwnership::InteriorPointer;
 }
 
-OperandOwnership
-OperandOwnershipBuiltinClassifier::visitCreateAsyncTaskFuture(BuiltinInst *bi,
-                                                              StringRef attr) {
-  // The function operand is consumed by the new task.
-  if (&op == &bi->getOperandRef(PARAMETER_INDEX_CREATE_ASYNC_TASK_FUTURE_FUNCTION))
-    return OperandOwnership::DestroyingConsume;
-
-  // FIXME: These are considered InteriorPointer because they may propagate a
-  // pointer into a borrowed values. If they do not propagate an interior pointer,
-  // then they should be InstantaneousUse instead and should not require a
-  // guaranteed value.
-  return OperandOwnership::InteriorPointer;
-}
-
 OperandOwnership
 OperandOwnershipBuiltinClassifier::visitCreateAsyncTaskGroupFuture(BuiltinInst *bi,
                                                                    StringRef attr) {
diff --git a/lib/SIL/IR/ValueOwnership.cpp b/lib/SIL/IR/ValueOwnership.cpp
@@ -533,7 +533,6 @@ CONSTANT_OWNERSHIP_BUILTIN(None, GlobalStringTablePointer)
 CONSTANT_OWNERSHIP_BUILTIN(None, GetCurrentAsyncTask)
 CONSTANT_OWNERSHIP_BUILTIN(None, CancelAsyncTask)
 CONSTANT_OWNERSHIP_BUILTIN(Owned, CreateAsyncTask)
-CONSTANT_OWNERSHIP_BUILTIN(Owned, CreateAsyncTaskFuture)
 CONSTANT_OWNERSHIP_BUILTIN(Owned, CreateAsyncTaskGroupFuture)
 CONSTANT_OWNERSHIP_BUILTIN(None, ConvertTaskToJob)
 CONSTANT_OWNERSHIP_BUILTIN(None, InitializeDefaultActor)
diff --git a/lib/SIL/Utils/MemAccessUtils.cpp b/lib/SIL/Utils/MemAccessUtils.cpp
@@ -1853,7 +1853,6 @@ static void visitBuiltinAddress(BuiltinInst *builtin,
     case BuiltinValueKind::TSanInoutAccess:
     case BuiltinValueKind::CancelAsyncTask:
     case BuiltinValueKind::CreateAsyncTask:
-    case BuiltinValueKind::CreateAsyncTaskFuture:
     case BuiltinValueKind::CreateAsyncTaskGroupFuture:
     case BuiltinValueKind::AutoDiffCreateLinearMapContext:
     case BuiltinValueKind::AutoDiffAllocateSubcontext:
diff --git a/lib/SILGen/SILGenBuiltin.cpp b/lib/SILGen/SILGenBuiltin.cpp
@@ -1401,9 +1401,8 @@ emitFunctionArgumentForAsyncTaskEntryPoint(SILGenFunction &SGF,
   return function.ensurePlusOne(SGF, loc);
 }
 
-// Emit SIL for the named builtin: createAsyncTask or createAsyncTaskFuture.
+// Emit SIL for the named builtin: createAsyncTask.
 static ManagedValue emitBuiltinCreateAsyncTask(
-    BuiltinValueKind kind,
     SILGenFunction &SGF, SILLocation loc, SubstitutionMap subs,
     ArrayRef<ManagedValue> args, SGFContext C) {
   ASTContext &ctx = SGF.getASTContext();
@@ -1453,26 +1452,12 @@ static ManagedValue emitBuiltinCreateAsyncTask(
 
   auto apply = SGF.B.createBuiltin(
       loc,
-      ctx.getIdentifier(getBuiltinName(kind)),
+      ctx.getIdentifier(getBuiltinName(BuiltinValueKind::CreateAsyncTask)),
       SGF.getLoweredType(getAsyncTaskAndContextType(ctx)), subs,
       { flags, taskOptions, futureResultMetadata, function.forward(SGF) });
   return SGF.emitManagedRValueWithCleanup(apply);
 }
 
-static ManagedValue emitBuiltinCreateAsyncTask(
-    SILGenFunction &SGF, SILLocation loc, SubstitutionMap subs,
-    ArrayRef<ManagedValue> args, SGFContext C) {
-  return emitBuiltinCreateAsyncTask(
-      BuiltinValueKind::CreateAsyncTask, SGF, loc, subs, args, C);
-}
-
-static ManagedValue emitBuiltinCreateAsyncTaskFuture(
-    SILGenFunction &SGF, SILLocation loc, SubstitutionMap subs,
-    ArrayRef<ManagedValue> args, SGFContext C) {
-  return emitBuiltinCreateAsyncTask(
-      BuiltinValueKind::CreateAsyncTaskFuture, SGF, loc, subs, args, C);
-}
-
 // Emit SIL for the named builtin: createAsyncTaskGroupFuture.
 static ManagedValue emitBuiltinCreateAsyncTaskGroupFuture(
     SILGenFunction &SGF, SILLocation loc, SubstitutionMap subs,
diff --git a/lib/SILOptimizer/Transforms/AccessEnforcementReleaseSinking.cpp b/lib/SILOptimizer/Transforms/AccessEnforcementReleaseSinking.cpp
@@ -174,7 +174,6 @@ static bool isBarrier(SILInstruction *inst) {
     case BuiltinValueKind::CancelAsyncTask:
     case BuiltinValueKind::StartAsyncLet:
     case BuiltinValueKind::CreateAsyncTask:
-    case BuiltinValueKind::CreateAsyncTaskFuture:
     case BuiltinValueKind::CreateAsyncTaskGroupFuture:
     case BuiltinValueKind::ConvertTaskToJob:
     case BuiltinValueKind::InitializeDefaultActor:
diff --git a/stdlib/public/Concurrency/Task.cpp b/stdlib/public/Concurrency/Task.cpp
@@ -678,24 +678,6 @@ static size_t convertJobFlagsToTaskCreateFlags(size_t rawJobFlags) {
   return taskCreateFlags.getOpaqueValue();
 }
 
-AsyncTaskAndContext swift::swift_task_create_future(
-                     size_t flags,
-                     TaskOptionRecord *options,
-                     const Metadata *futureResultType,
-                     void *closureEntry, HeapObject * /* +1 */ closureContext) {
-  FutureAsyncSignature::FunctionType *taskEntry;
-  size_t initialContextSize;
-  std::tie(taskEntry, initialContextSize)
-    = getAsyncClosureEntryPointAndContextSize<
-      FutureAsyncSignature,
-      SpecialPointerAuthDiscriminators::AsyncFutureFunction
-    >(closureEntry, closureContext);
-
-  return swift_task_create_common(
-      convertJobFlagsToTaskCreateFlags(flags), options, futureResultType,
-      taskEntry, closureContext, initialContextSize);
-}
-
 AsyncTaskAndContext swift::swift_task_create_async_let_future(
                      size_t rawFlags,
                      TaskOptionRecord *options,
diff --git a/test/IRGen/async/builtins.sil b/test/IRGen/async/builtins.sil
@@ -38,8 +38,8 @@ bb0(%0 : $Int, %1 : $Optional<Builtin.RawPointer>, %2: @guaranteed $@async @call
   // CHECK: call %swift.refcounted* @swift_retain(%swift.refcounted* returned [[FN_CONTEXT:%3]])
   %9 = metatype $@thick T.Type
   %10 = init_existential_metatype %9 : $@thick T.Type, $@thick Any.Type
-  // CHECK: [[NEW_TASK_AND_CONTEXT:%.*]] = call swift{{(tail)?}}cc %swift.async_task_and_context @swift_task_create_future(
-  %20 = builtin "createAsyncTaskFuture"<T>(%0 : $Int, %1 : $Optional<Builtin.RawPointer>, %10 : $@thick Any.Type, %5 : $@async @callee_owned @substituted <τ_0_0> () -> (@out τ_0_0, @error Error) for <T>) : $(Builtin.NativeObject, Builtin.RawPointer)
+  // CHECK: [[NEW_TASK_AND_CONTEXT:%.*]] = call swift{{(tail)?}}cc %swift.async_task_and_context @swift_task_create(
+  %20 = builtin "createAsyncTask"<T>(%0 : $Int, %1 : $Optional<Builtin.RawPointer>, %10 : $@thick Any.Type, %5 : $@async @callee_owned @substituted <τ_0_0> () -> (@out τ_0_0, @error Error) for <T>) : $(Builtin.NativeObject, Builtin.RawPointer)
   destroy_value %20 : $(Builtin.NativeObject, Builtin.RawPointer)
   %21 = tuple ()
   return %21 : $()
@@ -52,8 +52,8 @@ bb0(%0 : $Int, %1 : $Optional<Builtin.RawPointer>, %2: @guaranteed $@async @call
   // CHECK: call %swift.refcounted* @swift_retain(%swift.refcounted* returned [[FN_CONTEXT:%3]])
   %8 = metatype $@thick ().Type                   // user: %9
   %9 = init_existential_metatype %8 : $@thick ().Type, $@thick Any.Type // user: %10
-  // CHECK: [[NEW_TASK_AND_CONTEXT:%.*]] = call swift{{(tail)?}}cc %swift.async_task_and_context @swift_task_create_future(
-  %20 = builtin "createAsyncTaskFuture"<()>(%0 : $Int, %1 : $Optional<Builtin.RawPointer>, %9 : $@thick Any.Type, %5 : $@async @callee_owned @substituted <τ_0_0> () -> (@out τ_0_0, @error Error) for <()>) : $(Builtin.NativeObject, Builtin.RawPointer)
+  // CHECK: [[NEW_TASK_AND_CONTEXT:%.*]] = call swift{{(tail)?}}cc %swift.async_task_and_context @swift_task_create(
+  %20 = builtin "createAsyncTask"<()>(%0 : $Int, %1 : $Optional<Builtin.RawPointer>, %9 : $@thick Any.Type, %5 : $@async @callee_owned @substituted <τ_0_0> () -> (@out τ_0_0, @error Error) for <()>) : $(Builtin.NativeObject, Builtin.RawPointer)
   destroy_value %20 : $(Builtin.NativeObject, Builtin.RawPointer)
   %21 = tuple ()
   return %21 : $()
diff --git a/unittests/runtime/TaskStatus.cpp b/unittests/runtime/TaskStatus.cpp
@@ -52,7 +52,7 @@ static void simpleTaskInvokeFunction(SWIFT_ASYNC_CONTEXT AsyncContext *context,
 }
 
 template <class T>
-static void withSimpleTask(TaskCreationFlags flags, T &&value,
+static void withSimpleTask(TaskCreateFlags flags, T &&value,
                            undeduced<InvokeFunctionRef<T>> invokeFn,
                            BodyFunctionRef body) {
   auto taskAndContext =
@@ -77,7 +77,7 @@ template <class T>
 static void withSimpleTask(T &&value,
                            undeduced<InvokeFunctionRef<T>> invokeFn,
                            BodyFunctionRef bodyFn) {
-  withSimpleTask(TaskCreationFlags(), std::forward<T>(value), invokeFn, bodyFn);
+  withSimpleTask(TaskCreateFlags(), std::forward<T>(value), invokeFn, bodyFn);
 }
 
 static ExecutorRef createFakeExecutor(uintptr_t value) {
