Merge pull request swiftlang#35666 from slavapestov/async-throws-dispatch-thunk

IRGen: Fix preservation of error result in async dispatch thunks

Author: slavapestov

lib/IRGen/GenThunk.cpp

@@ -165,9 +165,10 @@ void IRGenThunk::prepareArguments() {
     }
 
     for (unsigned i = 0, e = asyncLayout->getArgumentCount(); i < e; ++i) {
-      Address addr = asyncLayout->getArgumentLayout(i).project(
-          IGF, context, llvm::None);
-      params.add(IGF.Builder.CreateLoad(addr));
+      auto layout = asyncLayout->getArgumentLayout(i);
+      Address addr = layout.project(IGF, context, llvm::None);
+      auto &ti = cast<LoadableTypeInfo>(layout.getType());
+      ti.loadAsTake(IGF, addr, params);
     }
 
     if (asyncLayout->hasBindings()) {
@@ -329,8 +330,20 @@ void IRGenThunk::emit() {
     emission->emitToExplosion(result, /*isOutlined=*/false);
   }
 
+  llvm::Value *errorValue = nullptr;
+
+  if (isAsync && origTy->hasErrorResult()) {
+    SILType errorType = conv.getSILErrorType(expansionContext);
+    Address calleeErrorSlot = emission->getCalleeErrorSlot(errorType);
+    errorValue = IGF.Builder.CreateLoad(calleeErrorSlot);
+  }
+
   emission->end();
 
+  if (isAsync && errorValue) {
+    IGF.Builder.CreateStore(errorValue, IGF.getCallerErrorResultSlot());
+  }
+
   if (isAsync) {
     emitAsyncReturn(IGF, *asyncLayout, origTy);
     IGF.emitCoroutineOrAsyncExit();

test/Concurrency/Runtime/Inputs/resilient_class.swift

@@ -1,3 +1,7 @@
+public enum MyError : Error {
+  case bad
+}
+
 open class BaseClass<T> {
   let value: T
 
@@ -9,4 +13,9 @@ open class BaseClass<T> {
   open func wait() async -> T {
     return value
   }
+  open func wait(orThrow: Bool) async throws {
+    if orThrow {
+      throw MyError.bad
+    }
+  }
 }

test/Concurrency/Runtime/Inputs/resilient_protocol.swift

@@ -2,4 +2,5 @@ public protocol Awaitable {
   associatedtype Result
   func waitForNothing() async
   func wait() async -> Result
+  func wait(orThrow: Bool) async throws
 }

test/Concurrency/Runtime/class_resilience.swift

@@ -24,14 +24,22 @@ class MyDerived : BaseClass<Int> {
   override func wait() async -> Int {
     return await super.wait() * 2
   }
+
+  override func wait(orThrow: Bool) async throws {
+    return try await super.wait(orThrow: orThrow)
+  }
 }
 
 func virtualWaitForNothing<T>(_ c: BaseClass<T>) async {
   await c.waitForNothing()
 }
 
-func virtualWait<T>(_ t: BaseClass<T>) async -> T {
-  return await t.wait()
+func virtualWait<T>(_ c: BaseClass<T>) async -> T {
+  return await c.wait()
+}
+
+func virtualWait<T>(orThrow: Bool, _ c: BaseClass<T>) async throws {
+  return try await c.wait(orThrow: orThrow)
 }
 
 var AsyncVTableMethodSuite = TestSuite("ResilientClass")
@@ -43,6 +51,9 @@ AsyncVTableMethodSuite.test("AsyncVTableMethod") {
     await virtualWaitForNothing(x)
 
     expectEqual(642, await virtualWait(x))
+
+    expectNil(try? await virtualWait(orThrow: true, x))
+    try! await virtualWait(orThrow: false, x)
   }
 }
 

test/Concurrency/Runtime/protocol_resilience.swift

@@ -16,12 +16,22 @@
 import StdlibUnittest
 import resilient_protocol
 
+enum MyError : Error {
+	case bad
+}
+
 struct IntAwaitable : Awaitable {
   func waitForNothing() async {}
 
   func wait() async -> Int {
     return 123
   }
+
+  func wait(orThrow: Bool) async throws {
+    if (orThrow) {
+      throw MyError.bad
+    }
+  }
 }
 
 func genericWaitForNothing<T : Awaitable>(_ t: T) async {
@@ -32,6 +42,10 @@ func genericWait<T : Awaitable>(_ t: T) async -> T.Result {
   return await t.wait()
 }
 
+func genericWait<T : Awaitable>(orThrow: Bool, _ t: T) async throws {
+  return try await t.wait(orThrow: orThrow)
+}
+
 var AsyncProtocolRequirementSuite = TestSuite("ResilientProtocol")
 
 AsyncProtocolRequirementSuite.test("AsyncProtocolRequirement") {
@@ -41,6 +55,9 @@ AsyncProtocolRequirementSuite.test("AsyncProtocolRequirement") {
     await genericWaitForNothing(x)
 
     expectEqual(123, await genericWait(x))
+
+    expectNil(try? await genericWait(orThrow: true, x))
+    try! await genericWait(orThrow: false, x)
   }
 }