remove buildOrdinaryTaskExecutorRef until we need it

ktoso · ktoso · commit c29bffd2becb · 2023-11-02T15:50:43.000+09:00
diff --git a/include/swift/AST/Builtins.def b/include/swift/AST/Builtins.def
@@ -1004,11 +1004,6 @@ BUILTIN_MISC_OPERATION_WITH_SILGEN(AutoDiffAllocateSubcontextWithType, "autoDiff
 BUILTIN_MISC_OPERATION_WITH_SILGEN(BuildOrdinarySerialExecutorRef,
                                    "buildOrdinarySerialExecutorRef", "n", Special)
 
-/// Build a Builtin.Executor value from an "ordinary" task executor
-/// reference.
-BUILTIN_MISC_OPERATION_WITH_SILGEN(BuildOrdinaryTaskExecutorRef,
-                                   "buildOrdinaryTaskExecutorRef", "n", Special)
-
 /// Build a Builtin.Executor value from an "complex equality" serial executor
 /// reference.
 BUILTIN_MISC_OPERATION_WITH_SILGEN(BuildComplexEqualitySerialExecutorRef,
diff --git a/include/swift/Basic/Features.def b/include/swift/Basic/Features.def
@@ -83,7 +83,6 @@ LANGUAGE_FEATURE(BuiltinTaskGroupWithArgument, 0, "TaskGroup builtins", true)
 LANGUAGE_FEATURE(InheritActorContext, 0, "@_inheritActorContext attribute", true)
 LANGUAGE_FEATURE(ImplicitSelfCapture, 0, "@_implicitSelfCapture attribute", true)
 LANGUAGE_FEATURE(BuiltinBuildExecutor, 0, "Executor-building builtins", true)
-LANGUAGE_FEATURE(BuiltinBuildTaskExecutor, 0, "TaskExecutor-building builtins", true)
 LANGUAGE_FEATURE(BuiltinBuildComplexEqualityExecutor, 0, "Executor-building for 'complexEquality executor' builtins", true)
 LANGUAGE_FEATURE(BuiltinBuildMainExecutor, 0, "MainActor executor building builtin", true)
 LANGUAGE_FEATURE(BuiltinCreateAsyncTaskInGroup, 0, "MainActor executor building builtin", true)
diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
@@ -3086,10 +3086,6 @@ static bool usesFeatureBuiltinExecutor(Decl *decl) {
   return usesBuiltinType(decl, BuiltinTypeKind::BuiltinExecutor);
 }
 
-static bool usesFeatureBuiltinBuildTaskExecutor(Decl *decl) {
-  return false;
-}
-
 static bool usesFeatureBuiltinBuildExecutor(Decl *decl) {
   return false;
 }
diff --git a/lib/AST/Builtins.cpp b/lib/AST/Builtins.cpp
@@ -1610,16 +1610,6 @@ static ValueDecl *getTargetOSVersionAtLeast(ASTContext &Context,
   return getBuiltinFunction(Id, {int32Type, int32Type, int32Type}, int32Type);
 }
 
-static ValueDecl *getBuildOrdinaryTaskExecutorRef(ASTContext &ctx,
-                                                  Identifier id) {
-  return getBuiltinFunction(ctx, id, _thin,
-                            _generics(_unrestricted,
-                                      _conformsTo(_typeparam(0), _taskExecutor)),
-                            _parameters(_typeparam(0)),
-                            _executor);
-}
-
-
 static ValueDecl *getBuildOrdinarySerialExecutorRef(ASTContext &ctx,
                                                     Identifier id) {
   return getBuiltinFunction(ctx, id, _thin,
@@ -2929,9 +2919,6 @@ ValueDecl *swift::getBuiltinValueDecl(ASTContext &Context, Identifier Id) {
   case BuiltinValueKind::BuildComplexEqualitySerialExecutorRef:
     return getBuildComplexEqualitySerialExecutorRef(Context, Id);
 
-  case BuiltinValueKind::BuildOrdinaryTaskExecutorRef:
-    return getBuildOrdinaryTaskExecutorRef(Context, Id);
-
   case BuiltinValueKind::PoundAssert:
     return getPoundAssert(Context, Id);
 
diff --git a/lib/IRGen/GenBuiltin.cpp b/lib/IRGen/GenBuiltin.cpp
@@ -426,13 +426,6 @@ void irgen::emitBuiltinCall(IRGenFunction &IGF, const BuiltinInfo &Builtin,
     emitBuildOrdinarySerialExecutorRef(IGF, actor, type, conf, out);
     return;
   }
-  if (Builtin.ID == BuiltinValueKind::BuildOrdinaryTaskExecutorRef) {
-    auto actor = args.claimNext();
-    auto type = substitutions.getReplacementTypes()[0]->getCanonicalType();
-    auto conf = substitutions.getConformances()[0];
-    emitBuildOrdinaryTaskExecutorRef(IGF, actor, type, conf, out);
-    return;
-  }
   if (Builtin.ID == BuiltinValueKind::BuildComplexEqualitySerialExecutorRef) {
     auto actor = args.claimNext();
     auto type = substitutions.getReplacementTypes()[0]->getCanonicalType();
diff --git a/lib/IRGen/GenConcurrency.cpp b/lib/IRGen/GenConcurrency.cpp
@@ -174,23 +174,6 @@ void irgen::emitBuildOrdinarySerialExecutorRef(IRGenFunction &IGF,
   out.add(impl);
 }
 
-void irgen::emitBuildOrdinaryTaskExecutorRef(IRGenFunction &IGF,
-                                             llvm::Value *executor,
-                                             CanType executorType,
-                                             ProtocolConformanceRef executorConf,
-                                             Explosion &out) {
-  // The implementation word of an "ordinary" task executor is
-  // just the witness table pointer with no flags set.
-  llvm::Value *identity =
-    IGF.Builder.CreatePtrToInt(executor, IGF.IGM.ExecutorFirstTy);
-  llvm::Value *impl =
-    emitWitnessTableRef(IGF, executorType, executorConf);
-  impl = IGF.Builder.CreatePtrToInt(impl, IGF.IGM.ExecutorSecondTy);
-
-  out.add(identity);
-  out.add(impl);
-}
-
 void irgen::emitBuildComplexEqualitySerialExecutorRef(IRGenFunction &IGF,
                                                llvm::Value *executor,
                                                CanType executorType,
diff --git a/lib/IRGen/GenConcurrency.h b/lib/IRGen/GenConcurrency.h
@@ -54,13 +54,6 @@ void emitBuildOrdinarySerialExecutorRef(IRGenFunction &IGF,
                                         ProtocolConformanceRef executorConformance,
                                         Explosion &out);
 
-/// Emit the buildOrdinaryTaskExecutorRef builtin.
-void emitBuildOrdinaryTaskExecutorRef(IRGenFunction &IGF,
-                                      llvm::Value *executor,
-                                      CanType executorType,
-                                      ProtocolConformanceRef executorConformance,
-                                      Explosion &out);
-
 /// Emit the buildComplexEqualitySerialExecutorRef builtin.
 void emitBuildComplexEqualitySerialExecutorRef(IRGenFunction &IGF,
                                         llvm::Value *executor,
diff --git a/lib/SIL/IR/OperandOwnership.cpp b/lib/SIL/IR/OperandOwnership.cpp
@@ -959,7 +959,6 @@ BUILTIN_OPERAND_OWNERSHIP(PointerEscape, AutoDiffProjectTopLevelSubcontext)
 // ownership should be 'TrivialUse'.
 BUILTIN_OPERAND_OWNERSHIP(ForwardingConsume, ConvertTaskToJob)
 
-BUILTIN_OPERAND_OWNERSHIP(BitwiseEscape, BuildOrdinaryTaskExecutorRef)
 BUILTIN_OPERAND_OWNERSHIP(BitwiseEscape, BuildOrdinarySerialExecutorRef)
 BUILTIN_OPERAND_OWNERSHIP(BitwiseEscape, BuildComplexEqualitySerialExecutorRef)
 BUILTIN_OPERAND_OWNERSHIP(BitwiseEscape, BuildDefaultActorExecutorRef)
diff --git a/lib/SIL/IR/ValueOwnership.cpp b/lib/SIL/IR/ValueOwnership.cpp
@@ -581,7 +581,6 @@ CONSTANT_OWNERSHIP_BUILTIN(None, GetCurrentExecutor)
 CONSTANT_OWNERSHIP_BUILTIN(None, ResumeNonThrowingContinuationReturning)
 CONSTANT_OWNERSHIP_BUILTIN(None, ResumeThrowingContinuationReturning)
 CONSTANT_OWNERSHIP_BUILTIN(None, ResumeThrowingContinuationThrowing)
-CONSTANT_OWNERSHIP_BUILTIN(None, BuildOrdinaryTaskExecutorRef)
 CONSTANT_OWNERSHIP_BUILTIN(None, BuildOrdinarySerialExecutorRef)
 CONSTANT_OWNERSHIP_BUILTIN(None, BuildComplexEqualitySerialExecutorRef)
 CONSTANT_OWNERSHIP_BUILTIN(None, BuildDefaultActorExecutorRef)
diff --git a/lib/SIL/Utils/InstructionUtils.cpp b/lib/SIL/Utils/InstructionUtils.cpp
@@ -988,7 +988,6 @@ RuntimeEffect swift::getRuntimeEffect(SILInstruction *inst, SILType &impactType)
       return RuntimeEffect::RefCounting | RuntimeEffect::Deallocating;
     case BuiltinValueKind::Swift3ImplicitObjCEntrypoint:
       return RuntimeEffect::ObjectiveC | RuntimeEffect::Allocating;
-    case BuiltinValueKind::BuildOrdinaryTaskExecutorRef:
     case BuiltinValueKind::BuildOrdinarySerialExecutorRef:
     case BuiltinValueKind::BuildComplexEqualitySerialExecutorRef:
     case BuiltinValueKind::BuildDefaultActorExecutorRef:
diff --git a/lib/SIL/Verifier/SILVerifier.cpp b/lib/SIL/Verifier/SILVerifier.cpp
@@ -2112,7 +2112,6 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
     }
 
     if (builtinKind == BuiltinValueKind::BuildOrdinarySerialExecutorRef ||
-        builtinKind == BuiltinValueKind::BuildOrdinaryTaskExecutorRef ||
         builtinKind == BuiltinValueKind::BuildComplexEqualitySerialExecutorRef ||
         builtinKind == BuiltinValueKind::BuildDefaultActorExecutorRef) {
       require(arguments.size() == 1,
diff --git a/lib/SILGen/SILGenBuiltin.cpp b/lib/SILGen/SILGenBuiltin.cpp
@@ -1780,12 +1780,6 @@ static ManagedValue emitBuildExecutorRef(SILGenFunction &SGF, SILLocation loc,
       subs, argValues);
   return ManagedValue::forObjectRValueWithoutOwnership(builtinApply);
 }
-static ManagedValue emitBuiltinBuildOrdinaryTaskExecutorRef(
-    SILGenFunction &SGF, SILLocation loc, SubstitutionMap subs,
-    ArrayRef<ManagedValue> args, SGFContext C) {
-  return emitBuildExecutorRef(SGF, loc, subs, args,
-                            BuiltinValueKind::BuildOrdinaryTaskExecutorRef);
-}
 static ManagedValue emitBuiltinBuildOrdinarySerialExecutorRef(
     SILGenFunction &SGF, SILLocation loc, SubstitutionMap subs,
     ArrayRef<ManagedValue> args, SGFContext C) {
diff --git a/lib/SILOptimizer/Transforms/AccessEnforcementReleaseSinking.cpp b/lib/SILOptimizer/Transforms/AccessEnforcementReleaseSinking.cpp
@@ -191,7 +191,6 @@ static bool isBarrier(SILInstruction *inst) {
     case BuiltinValueKind::DestroyDefaultActor:
     case BuiltinValueKind::InitializeDistributedRemoteActor:
     case BuiltinValueKind::InitializeNonDefaultDistributedActor:
-    case BuiltinValueKind::BuildOrdinaryTaskExecutorRef:
     case BuiltinValueKind::BuildOrdinarySerialExecutorRef:
     case BuiltinValueKind::BuildComplexEqualitySerialExecutorRef:
     case BuiltinValueKind::BuildDefaultActorExecutorRef:
diff --git a/stdlib/public/CompatibilityOverride/CompatibilityOverrideConcurrency.def b/stdlib/public/CompatibilityOverride/CompatibilityOverrideConcurrency.def
@@ -108,26 +108,26 @@
 
 OVERRIDE_ACTOR(task_enqueue, void,
                SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift),
-               swift::, (Job *job, ExecutorRef executor),
+               swift::, (Job *job, SerialExecutorRef executor),
                (job, executor))
 
 OVERRIDE_ACTOR(job_run, void,
                SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift),
-               swift::, (Job *job, ExecutorRef executor),
+               swift::, (Job *job, SerialExecutorRef executor),
                (job, executor))
 
-OVERRIDE_ACTOR(task_getCurrentExecutor, ExecutorRef,
+OVERRIDE_ACTOR(task_getCurrentExecutor, SerialExecutorRef,
                SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift),
                swift::, ,)
 
 OVERRIDE_ACTOR(task_isCurrentExecutor, bool,
                SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift),
-               swift::, (ExecutorRef executor), (executor))
+               swift::, (SerialExecutorRef executor), (executor))
 
 OVERRIDE_ACTOR(task_switch, void,
                SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swiftasync),
                swift::, (SWIFT_ASYNC_CONTEXT AsyncContext *resumeToContext,
-               TaskContinuationFunction *resumeFunction, ExecutorRef newExecutor),
+               TaskContinuationFunction *resumeFunction, SerialExecutorRef newExecutor),
                (resumeToContext, resumeFunction, newExecutor))
 
 OVERRIDE_TASK(task_create_common, AsyncTaskAndContext,
@@ -200,7 +200,7 @@ OVERRIDE_TASK(task_suspend, AsyncTask *,
 
 OVERRIDE_TASK(task_enqueueTaskOnExecutor, void,
               SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift), swift::,
-              (AsyncTask *task, ExecutorRef newExecutor), (task, newExecutor))
+              (AsyncTask *task, SerialExecutorRef newExecutor), (task, newExecutor))
 
 OVERRIDE_TASK(continuation_init, AsyncTask *,
               SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift),
diff --git a/stdlib/public/Concurrency/Executor.swift b/stdlib/public/Concurrency/Executor.swift
@@ -119,7 +119,7 @@ public protocol TaskExecutor: Executor {
   // avoid drilling down to the base conformance just for the basic
   // work-scheduling operation.
   @_nonoverride
-  @available(*, deprecated, message: "Implement 'enqueue(_: __owned ExecutorJob)' instead")
+  @available(*, deprecated, message: "Implement 'enqueue(_: consuming ExecutorJob)' instead")
   func enqueue(_ job: consuming Job)
   #endif // !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
 
@@ -132,13 +132,7 @@ public protocol TaskExecutor: Executor {
   func enqueue(_ job: consuming ExecutorJob)
   #endif // !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
 
-  /// Convert this executor value to the optimized form of borrowed
-  /// executor references.
-  ///
-  /// When forming an unowned executor reference you MUST guarantee
-  /// that the executor will be kept alive (retained) until all tasks
-  /// run by that executor have completed.
-  func asUnownedTaskExecutor() -> UnownedTaskExecutor
+  // TODO: Implement: func asUnownedTaskExecutor() -> UnownedTaskExecutor
 }
 
 #if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
@@ -250,39 +244,6 @@ public struct UnownedSerialExecutor: Sendable {
 
 }
 
-@available(SwiftStdlib 9999, *)
-@frozen
-public struct UnownedTaskExecutor: Sendable {
-  #if compiler(>=5.5) && $BuiltinExecutor
-  @usableFromInline
-  internal var executor: Builtin.Executor
-
-  /// SPI: Do not use. Cannot be marked @_spi, since we need to use it from Distributed module
-  /// which needs to reach for this from an @_transparent function which prevents @_spi use.
-  public var _executor: Builtin.Executor {
-    self.executor
-  }
-  #endif
-
-  @inlinable
-  public init(_ executor: Builtin.Executor) {
-    #if compiler(>=5.5) && $BuiltinExecutor
-    self.executor = executor
-    #endif
-  }
-
-  @inlinable
-  public init<E: TaskExecutor>(_ executor: __shared E) {
-    // FIXME: #if compiler(>=9999) && $BuiltinBuildExecutor
-    #if $BuiltinBuildTaskExecutor
-    self.executor = Builtin.buildOrdinaryTaskExecutorRef(executor)
-    #else
-    fatalError("Swift compiler is incompatible with this SDK version")
-    #endif
-  }
-
-}
-
 /// Checks if the current task is running on the expected executor.
 ///
 /// Generally, Swift programs should be constructed such that it is statically
diff --git a/test/IRGen/async/builtin_executor.sil b/test/IRGen/async/builtin_executor.sil
@@ -23,12 +23,6 @@ actor MyCustomActor : SerialExecutor {
 }
 sil_vtable MyCustomActor {}
 
-final class CustomTaskExecutor : TaskExecutor {
-  func enqueue(_ job: consuming ExecutorJob)
-  final nonisolated func asUnownedTaskExecutor() -> UnownedTaskExecutor
-}
-sil_vtable CustomTaskExecutor {}
-
 // CHECK: define{{.*}} swiftcc { [[INT]], [[INT]] } @test_none()
 sil @test_none : $() -> Optional<Builtin.Executor> {
 bb0:
@@ -70,16 +64,3 @@ bb0(%0 : $MyCustomActor):
   %1 = builtin "buildOrdinarySerialExecutorRef"<MyCustomActor>(%0 : $MyCustomActor) : $Builtin.Executor
   return %1 : $Builtin.Executor
 }
-
-// CHECK: define{{.*}} swiftcc { [[INT]], [[INT]] } @test_build_custom_task_exec(ptr %0)
-sil @test_build_custom_task_exec : $(@guaranteed CustomTaskExecutor) -> Builtin.Executor {
-bb0(%0 : $CustomTaskExecutor):
-  // CHECK:      [[T0:%.*]] = ptrtoint ptr %0 to [[INT]]
-  // CHECK-NEXT: [[T1:%.*]] = call ptr @"$s4test18CustomTaskExecutorCACSchAAWl"()
-  // CHECK-NEXT: [[T2:%.*]] = ptrtoint ptr [[T1]] to [[INT]]
-  // CHECK:      [[ONE:%.*]] = insertvalue { [[INT]], [[INT]] } undef, [[INT]] [[T0]], 0
-  // CHECK-NEXT: [[TWO:%.*]] = insertvalue { [[INT]], [[INT]] } [[ONE]], [[INT]] [[T2]], 1
-  // CHECK-NEXT: ret { [[INT]], [[INT]] } [[TWO]]
-  %1 = builtin "buildOrdinaryTaskExecutorRef"<CustomTaskExecutor>(%0 : $CustomTaskExecutor) : $Builtin.Executor
-  return %1 : $Builtin.Executor
-}

Original file line number	Diff line number	Diff line change
`@@ -3086,10 +3086,6 @@ static bool usesFeatureBuiltinExecutor(Decl *decl) {`
`3086`	`3086`	`return usesBuiltinType(decl, BuiltinTypeKind::BuiltinExecutor);`
`3087`	`3087`	`}`
`3088`	`3088`
`3089`		`-static bool usesFeatureBuiltinBuildTaskExecutor(Decl *decl) {`
`3090`		`- return false;`
`3091`		`-}`
`3092`		`-`
`3093`	`3089`	`static bool usesFeatureBuiltinBuildExecutor(Decl *decl) {`
`3094`	`3090`	`return false;`
`3095`	`3091`	`}`