Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion stdlib/public/Concurrency/Actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1802,6 +1802,13 @@ static bool tryAssumeThreadForSwitch(ExecutorRef newExecutor,
return false;
}

__attribute__((noinline))
SWIFT_CC(swiftasync)
static void force_tail_call_hack(AsyncTask *task) {
// This *should* be executed as a tail call.
return task->runInFullyEstablishedContext();
}

/// Given that we've assumed control of an executor on this thread,
/// continue to run the given task on it.
SWIFT_CC(swiftasync)
Expand All @@ -1815,7 +1822,9 @@ static void runOnAssumedThread(AsyncTask *task, ExecutorRef executor,
oldTracking->setActiveExecutor(executor);

// FIXME: force tail call
return task->runInFullyEstablishedContext();
// return task->runInFullyEstablishedContext();
// This hack "ensures" that this call gets executed as a tail call.
return force_tail_call_hack(task);
}

// Otherwise, set up tracking info.
Expand Down
60 changes: 60 additions & 0 deletions test/Interpreter/async_fib.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// RUN: %empty-directory(%t)
// RUN: %target-build-swift -Xfrontend -enable-experimental-concurrency %s -parse-as-library -module-name main -o %t/main
// RUN: %target-codesign %t/main
// RUN: %target-run %t/main | %FileCheck %s

// REQUIRES: concurrency
// REQUIRES: executable_test
// UNSUPPORTED: use_os_stdlib
// UNSUPPORTED: back_deployment_runtime
// UNSUPPORTED: OS=windows-msvc

var gg = 0

@inline(never)
public func identity<T>(_ x: T) -> T {
gg += 1
return x
}

actor Actor {
var x: Int = 0
init(x: Int) { self.x = x }

@inline(never)
func get(_ i: Int ) async -> Int {
return i + x
}
}

// Used to crash with an stack overflow with m >= 18
let m = 22

@inline(never)
func asyncFib(_ n: Int, _ a1: Actor, _ a2: Actor) async -> Int {
if n == 0 {
return await a1.get(n)
}
if n == 1 {
return await a2.get(n)
}

let first = await asyncFib(n-2, a1, a2)
let second = await asyncFib(n-1, a1, a2)

let result = first + second

return result
}

@main struct Main {
static func main() async {
let a1 = Actor(x: 0)
let a2 = Actor(x: 0)
_ = await asyncFib(identity(m), a1, a2)

// CHECK: result: 0
await print("result: \(a1.x)");
await print(a2.x)
}
}