Merge pull request #36661 from varungandhi-apple/vg-main

Fix IRGen and tests to use musttail/swiftasync correctly

Author: varungandhi-apple

lib/IRGen/GenDecl.cpp

@@ -2613,7 +2613,12 @@ void IRGenModule::createReplaceableProlog(IRGenFunction &IGF, SILFunction *f) {
       FunctionPointer(silFunctionType, realReplFn, authInfo, signature)
           .getAsFunction(IGF),
       forwardedArgs);
-  Res->setTailCall();
+  if (Res->getCallingConv() == llvm::CallingConv::SwiftTail &&
+      Res->getCaller()->getCallingConv() == llvm::CallingConv::SwiftTail) {
+    Res->setTailCallKind(IGF.IGM.AsyncTailCallKind);
+  } else {
+    Res->setTailCall();
+  }
   if (IGF.CurFn->getReturnType()->isVoidTy())
     IGF.Builder.CreateRetVoid();
   else

test/IRGen/async/run-call-dynamic-void_to_void.swift

@@ -17,6 +17,7 @@ import _Concurrency
 // CHECK-LL: @"$s4main3runyyYFTu" = hidden global %swift.async_func_pointer
 
 // CHECK-LL: define hidden swift{{(tail)?}}cc void @"$s4main3runyyYF"(%swift.context* swiftasync {{%[0-9]+}}) {{#[0-9]*}}
+// CHECK-LL: musttail call swifttailcc void
 dynamic func run() async {
   print("running")
 }

unittests/runtime/Actor.cpp

@@ -120,7 +120,7 @@ class TaskContinuationFromLambda {
 
   SWIFT_CC(swiftasync)
   static void invoke(SWIFT_ASYNC_CONTEXT AsyncContext *context, SWIFT_CONTEXT HeapObject *) {
-    (*lambdaStorage)(static_cast<Context*>(context));
+    return (*lambdaStorage)(static_cast<Context*>(context));
   }
 
 public:
@@ -220,20 +220,20 @@ static AsyncTask *createTaskStoring(JobPriority priority,
 TEST(ActorTest, validateTestHarness) {
   run([] {
     auto task0 = createTask(JobPriority::Background,
-      [](AsyncContext *context) {
+      [](AsyncContext *context) SWIFT_CC(swiftasync) {
         EXPECT_PROGRESS(5);
         EXPECT_PROGRESS(6);
         finishTest();
         return context->ResumeParent(context);
       });
     auto task1 = createTask(JobPriority::Default,
-      [](AsyncContext *context) {
+      [](AsyncContext *context) SWIFT_CC(swiftasync) {
         EXPECT_PROGRESS(1);
         EXPECT_PROGRESS(2);
         return context->ResumeParent(context);
       });
     auto task2 = createTask(JobPriority::Default,
-      [](AsyncContext *context) {
+      [](AsyncContext *context) SWIFT_CC(swiftasync) {
         EXPECT_PROGRESS(3);
         EXPECT_PROGRESS(4);
         return context->ResumeParent(context);
@@ -254,22 +254,22 @@ TEST(ActorTest, actorSwitch) {
     auto actor = createActor();
     auto task0 = createTaskStoring(JobPriority::Default,
                                    (AsyncTask*) nullptr, actor,
-      [](Context *context) {
+      [](Context *context) SWIFT_CC(swiftasync) {
         EXPECT_PROGRESS(1);
         EXPECT_TRUE(swift_task_getCurrentExecutor().isGeneric());
         EXPECT_EQ(nullptr, context->get<0>());
         std::get<0>(context->values) = swift_task_getCurrent();
 
         auto continuation = prepareContinuation<Context>(
-          [](Context *context) {
+          [](Context *context) SWIFT_CC(swiftasync) {
             EXPECT_PROGRESS(2);
             auto executor = swift_task_getCurrentExecutor();
             EXPECT_FALSE(executor.isGeneric());
             EXPECT_EQ(ExecutorRef::forDefaultActor(context->get<1>()),
                       executor);
             EXPECT_EQ(swift_task_getCurrent(), context->get<0>());
             auto continuation = prepareContinuation<Context>(
-              [](Context *context) {
+              [](Context *context) SWIFT_CC(swiftasync) {
                 EXPECT_PROGRESS(3);
                 EXPECT_TRUE(swift_task_getCurrentExecutor().isGeneric());
                 EXPECT_EQ(swift_task_getCurrent(), context->get<0>());
@@ -296,7 +296,7 @@ TEST(ActorTest, actorContention) {
 
     auto task0 = createTaskStoring(JobPriority::Default,
                                    (AsyncTask*) nullptr, actor,
-      [](Context *context) {
+      [](Context *context) SWIFT_CC(swiftasync) {
         EXPECT_PROGRESS(1);
         EXPECT_TRUE(swift_task_getCurrentExecutor().isGeneric());
         EXPECT_EQ(nullptr, context->get<0>());
@@ -305,7 +305,7 @@ TEST(ActorTest, actorContention) {
         std::get<0>(context->values) = task;
 
         parkTask(task, context,
-          [](Context *context) {
+          [](Context *context) SWIFT_CC(swiftasync) {
             EXPECT_PROGRESS(3);
             auto executor = swift_task_getCurrentExecutor();
             EXPECT_FALSE(executor.isGeneric());
@@ -314,7 +314,7 @@ TEST(ActorTest, actorContention) {
             auto task = swift_task_getCurrent();
             EXPECT_EQ(task, context->get<0>());
             parkTask(task, context,
-              [](Context *context) {
+              [](Context *context) SWIFT_CC(swiftasync) {
                 EXPECT_PROGRESS(4);
                 EXPECT_TRUE(swift_task_getCurrentExecutor().isGeneric());
                 EXPECT_EQ(swift_task_getCurrent(), context->get<0>());
@@ -329,7 +329,7 @@ TEST(ActorTest, actorContention) {
 
     auto task1 = createTaskStoring(JobPriority::Background,
                                    (AsyncTask*) nullptr, actor,
-      [](Context *context) {
+      [](Context *context) SWIFT_CC(swiftasync) {
         EXPECT_PROGRESS(2);
         auto executor = swift_task_getCurrentExecutor();
         EXPECT_FALSE(executor.isGeneric());
@@ -340,7 +340,7 @@ TEST(ActorTest, actorContention) {
         std::get<0>(context->values) = task;
 
         parkTask(task, context,
-          [](Context *context) {
+          [](Context *context) SWIFT_CC(swiftasync) {
             EXPECT_PROGRESS(5);
             EXPECT_TRUE(swift_task_getCurrentExecutor().isGeneric());
             EXPECT_EQ(swift_task_getCurrent(), context->get<0>());

unittests/runtime/TaskStatus.cpp

@@ -48,7 +48,7 @@ static void simpleTaskInvokeFunction(SWIFT_ASYNC_CONTEXT AsyncContext *context,
   // Return to finish off the task.
   // In a normal situation we'd need to free the context, but here
   // we know we're at the top level.
-  valueContext->ResumeParent(valueContext);
+  return valueContext->ResumeParent(valueContext);
 }
 
 template <class T>