[Stack Switching] Fix resuming of return calls #7860
Merged
+108
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tlively
reviewed
Aug 26, 2025
test/lit/exec/cont_return_call.wast
Outdated
Comment on lines
48
to
49
| (return_call $sub) | ||
| ) |
There was a problem hiding this comment.
It might be worth adding another log after the return_call to test that it is never reached. It also might be worth adding a resume in the original function as well.
test/lit/exec/cont_return_call.wast
Outdated
Comment on lines
54
to
55
| (call $log (i32.const 300)) | ||
| (i32.const 0) |
There was a problem hiding this comment.
It might be worth having the tail-callee tail call yet another function that suspends to show that it works for more than one tail callee.
Co-authored-by: Thomas Lively <tlively123@gmail.com>
Co-authored-by: Thomas Lively <tlively123@gmail.com>
tlively
approved these changes
Aug 28, 2025
| ;; CHECK-NEXT: [LoggingExternalInterface logging 100] | ||
| ;; CHECK-NEXT: [LoggingExternalInterface logging 200] | ||
| ;; CHECK-NEXT: [LoggingExternalInterface logging 300] | ||
| ;; CHECK-NEXT: [LoggingExternalInterface logging 400] | ||
| ;; CHECK-NEXT: [LoggingExternalInterface logging 500] |
There was a problem hiding this comment.
Let's add logging to the main function to show that the suspends actually happen as well.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A return call is a form of control flow, so we need to handle it. Specifically,
the original function is unwound before calling the next one, so when we
resume, we should just call the next one. To do that, save the call target
along with the locals during unwinding.