Merge pull request swiftlang#36624 from rjmccall/executor-serialization

Fix executor serialization

Author: rjmccall

include/swift/ABI/Task.h

@@ -519,17 +519,12 @@ class YieldingAsyncContext : public AsyncContext {
   TaskContinuationFunction * __ptrauth_swift_async_context_yield
     YieldToParent;
 
-  /// The executor that the parent context needs to be yielded to on.
-  ExecutorRef YieldToParentExecutor;
-
   YieldingAsyncContext(AsyncContextFlags flags,
                        TaskContinuationFunction *resumeParent,
                        TaskContinuationFunction *yieldToParent,
-                       ExecutorRef yieldToParentExecutor,
                        AsyncContext *parent)
     : AsyncContext(flags, resumeParent, parent),
-      YieldToParent(yieldToParent),
-      YieldToParentExecutor(yieldToParentExecutor) {}
+      YieldToParent(yieldToParent) {}
 
   static bool classof(const AsyncContext *context) {
     return context->Flags.getKind() == AsyncContextKind::Yielding;

include/swift/Strings.h

@@ -124,7 +124,7 @@ constexpr static BuiltinNameStringLiteral BUILTIN_TYPE_NAME_JOB = {
     "Builtin.Job"};
 /// The name of the Builtin type for ExecutorRef
 constexpr static BuiltinNameStringLiteral BUILTIN_TYPE_NAME_EXECUTOR = {
-    "Builtin.ExecutorRef"};
+    "Builtin.Executor"};
 /// The name of the Builtin type for DefaultActorStorage
 constexpr static BuiltinNameStringLiteral BUILTIN_TYPE_NAME_DEFAULTACTORSTORAGE = {
     "Builtin.DefaultActorStorage"};

lib/AST/Builtins.cpp

@@ -85,6 +85,8 @@ Type swift::getBuiltinType(ASTContext &Context, StringRef Name) {
     return Context.TheJobType;
   if (Name == "DefaultActorStorage")
     return Context.TheDefaultActorStorageType;
+  if (Name == "Executor")
+    return Context.TheExecutorType;
   if (Name == "NativeObject")
     return Context.TheNativeObjectType;
   if (Name == "BridgeObject")

lib/IRGen/IRGenModule.cpp

@@ -630,8 +630,7 @@ IRGenModule::IRGenModule(IRGenerator &irgen,
   SwiftJobPtrTy = SwiftJobTy->getPointerTo(DefaultAS);
 
   // using TaskContinuationFunction =
-  //   SWIFT_CC(swift)
-  //   void (AsyncTask *, ExecutorRef, AsyncContext *);
+  //   SWIFT_CC(swift) void (SWIFT_ASYNC_CONTEXT AsyncContext *);
   TaskContinuationFunctionTy = llvm::FunctionType::get(
       VoidTy, {SwiftContextPtrTy}, /*isVarArg*/ false);
   TaskContinuationFunctionPtrTy = TaskContinuationFunctionTy->getPointerTo();

test/Serialization/Inputs/def_concurrency.sil

@@ -8,18 +8,28 @@ actor Act { }
 @_transparent public func serialize_all() {
 }
 
-// CHECK-LABEL: sil public_external [transparent] [serialized] @test_hop_to_executor
-sil [transparent] [serialized] @test_hop_to_executor : $@convention(thin) (@guaranteed Act) -> () {
+// CHECK-LABEL: sil public_external [transparent] [serialized] @test_hop_to_executor_actor
+sil [transparent] [serialized] @test_hop_to_executor_actor : $@convention(thin) (@guaranteed Act) -> () {
 bb0(%0 : $Act):
   // CHECK: hop_to_executor %0 : $Act
   hop_to_executor %0 : $Act
   %2 = tuple ()
   return %2 : $()
 }
 
+// CHECK-LABEL: sil public_external [transparent] [serialized] @test_hop_to_executor_builtin
+sil [transparent] [serialized] @test_hop_to_executor_builtin : $@convention(thin) (@guaranteed Builtin.Executor) -> () {
+bb0(%0 : $Builtin.Executor):
+  // CHECK: hop_to_executor %0 : $Builtin.Executor
+  hop_to_executor %0 : $Builtin.Executor
+  %2 = tuple ()
+  return %2 : $()
+}
+
 sil [transparent] [serialized] @$s15def_concurrency13serialize_allyyF : $@convention(thin) () -> () {
 bb0:
-  %91 = function_ref @test_hop_to_executor : $@convention(thin) (@guaranteed Act) -> ()
+  %0 = function_ref @test_hop_to_executor_actor : $@convention(thin) (@guaranteed Act) -> ()
+  %1 = function_ref @test_hop_to_executor_builtin : $@convention(thin) (@guaranteed Builtin.Executor) -> ()
 
   %r = tuple ()
   return %r : $()