Merge pull request #36815 from aschwaighofer/remove_hop_to_executor_in_no_async

hop_to_executor should have no affect if we inline a [noasync] applyinto a non async function.

Author: aschwaighofer

lib/IRGen/IRGenSIL.cpp

@@ -6138,6 +6138,11 @@ void IRGenSILFunction::visitCheckedCastAddrBranchInst(
 }
 
 void IRGenSILFunction::visitHopToExecutorInst(HopToExecutorInst *i) {
+  if (!i->getFunction()->isAsync()) {
+    // This should never occur.
+    assert(false && "The hop_to_executor should have been eliminated");
+    return;
+  }
   assert(i->getTargetExecutor()->getType().is<BuiltinExecutorType>());
   llvm::Value *resumeFn = Builder.CreateIntrinsicCall(
           llvm::Intrinsic::coro_async_resume, {});

lib/SILOptimizer/Utils/SILInliner.cpp

@@ -288,6 +288,7 @@ class SILInlineCloner
 
   void visitDebugValueInst(DebugValueInst *Inst);
   void visitDebugValueAddrInst(DebugValueAddrInst *Inst);
+  void visitHopToExecutorInst(HopToExecutorInst *Inst);
 
   void visitTerminator(SILBasicBlock *BB);
 
@@ -620,7 +621,15 @@ void SILInlineCloner::visitDebugValueAddrInst(DebugValueAddrInst *Inst) {
 
   return SILCloner<SILInlineCloner>::visitDebugValueAddrInst(Inst);
 }
+void SILInlineCloner::visitHopToExecutorInst(HopToExecutorInst *Inst) {
+  // Drop hop_to_executor in non async functions.
+  if (!Apply.getFunction()->isAsync()) {
+    assert(Apply.isNonAsync());
+    return;
+  }
 
+  return SILCloner<SILInlineCloner>::visitHopToExecutorInst(Inst);
+}
 const SILDebugScope *
 SILInlineCloner::getOrCreateInlineScope(const SILDebugScope *CalleeScope) {
   if (!CalleeScope)

test/SILOptimizer/mandatory_inlining.sil

@@ -1481,3 +1481,22 @@ bb0:
   return %r : $()
 }
 
+sil [transparent] @hop_to_executor : $@convention(thin) @async (@guaranteed Builtin.Executor) -> () {
+entry(%executor: $Builtin.Executor):
+  hop_to_executor %executor : $Builtin.Executor
+  %r = tuple ()
+  return %r : $()
+}
+
+// CHECK-LABEL: sil @test_inline_nonasync
+// CHECK-NOT: hop_to_executor
+// CHECK-NOT: apply
+// CHECK: } // end sil function 'test_inline_nonasync'
+
+sil @test_inline_nonasync : $@convention(thin) (@guaranteed Builtin.Executor) -> () {
+entry(%executor: $Builtin.Executor):
+  %f = function_ref @hop_to_executor : $@convention(thin) @async (@guaranteed Builtin.Executor) -> ()
+  %c = apply [noasync] %f(%executor) : $@convention(thin) @async (@guaranteed Builtin.Executor) -> ()
+  %r = tuple ()
+  return %r : $()
+}

test/SILOptimizer/performance_inliner.sil

@@ -994,3 +994,22 @@ bb0(%1 : $@thick X.Type):
   return %30 : $X
 }
 
+sil @hop_to_executor : $@convention(thin) @async (@guaranteed Builtin.Executor) -> () {
+entry(%executor: $Builtin.Executor):
+  hop_to_executor %executor : $Builtin.Executor
+  %r = tuple ()
+  return %r : $()
+}
+
+// CHECK-LABEL: sil @test_inline_nonasync
+// CHECK-NOT: hop_to_executor
+// CHECK-NOT: apply
+// CHECK: } // end sil function 'test_inline_nonasync'
+
+sil @test_inline_nonasync : $@convention(thin) (@guaranteed Builtin.Executor) -> () {
+entry(%executor: $Builtin.Executor):
+  %f = function_ref @hop_to_executor : $@convention(thin) @async (@guaranteed Builtin.Executor) -> ()
+  %c = apply [noasync] %f(%executor) : $@convention(thin) @async (@guaranteed Builtin.Executor) -> ()
+  %r = tuple ()
+  return %r : $()
+}