forked from llvm/llvm-project
-
Notifications
You must be signed in to change notification settings - Fork 352
[lldb][swift] Add support for async_let step-over #9628
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
felipepiovezan
merged 2 commits into
swiftlang:stable/20240723
from
felipepiovezan:felipe/fix_async_let_step_over
Nov 19, 2024
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
3 changes: 3 additions & 0 deletions
3
lldb/test/API/lang/swift/async/stepping/step_over_asynclet/Makefile
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SWIFT_SOURCES := main.swift | ||
| SWIFTFLAGS_EXTRAS := -parse-as-library | ||
| include Makefile.rules |
36 changes: 36 additions & 0 deletions
36
lldb/test/API/lang/swift/async/stepping/step_over_asynclet/TestSwiftAsyncStepOverAsyncLet.py
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import lldb | ||
| from lldbsuite.test.decorators import * | ||
| import lldbsuite.test.lldbtest as lldbtest | ||
| import lldbsuite.test.lldbutil as lldbutil | ||
|
|
||
|
|
||
| @skipIfAsan # rdar://138777205 | ||
| class TestCase(lldbtest.TestBase): | ||
|
|
||
| def check_is_in_line(self, thread, linenum): | ||
| frame = thread.frames[0] | ||
| line_entry = frame.GetLineEntry() | ||
| self.assertEqual(linenum, line_entry.GetLine()) | ||
|
|
||
| @swiftTest | ||
| @skipIf(oslist=["windows", "linux"]) | ||
| def test(self): | ||
| """Test conditions for async step-over.""" | ||
| self.build() | ||
|
|
||
| source_file = lldb.SBFileSpec("main.swift") | ||
| target, process, thread, bkpt = lldbutil.run_to_source_breakpoint( | ||
| self, "BREAK HERE", source_file | ||
| ) | ||
|
|
||
| # Step over should reach every line in the interval [10, 20] | ||
| expected_line_nums = [10, 11, 12, 13, 14, 15] | ||
| # FIXME: for some reason we loop back to the start of the do block after the last statement. | ||
| # rdar://140159600 | ||
| expected_line_nums += [8] | ||
| expected_line_nums += [17, 18, 19, 20] | ||
| for expected_line_num in expected_line_nums: | ||
| thread.StepOver() | ||
| stop_reason = thread.GetStopReason() | ||
| self.assertStopReason(stop_reason, lldb.eStopReasonPlanComplete) | ||
| self.check_is_in_line(thread, expected_line_num) | ||
27 changes: 27 additions & 0 deletions
27
lldb/test/API/lang/swift/async/stepping/step_over_asynclet/main.swift
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| func getTimestamp(x: Int) async -> Int { | ||
| return 40 + x | ||
| } | ||
|
|
||
| func work() {} | ||
|
|
||
| func foo() async { | ||
| do { | ||
| work() // BREAK HERE | ||
| async let timestamp1 = getTimestamp(x:1) | ||
| work() | ||
| async let timestamp2 = getTimestamp(x:2) | ||
| work() | ||
| let timestamps = await [timestamp1, timestamp2] | ||
| print(timestamps) | ||
| } | ||
| async let timestamp3 = getTimestamp(x:3) | ||
| work() | ||
| let actual_timestamp3 = await timestamp3 | ||
| print(actual_timestamp3) | ||
| } | ||
|
|
||
| @main enum entry { | ||
| static func main() async { | ||
| await foo() | ||
| } | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this still needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, good point, it shouldn't be needed anymore. There are a handful of tests with this annotation, so I'll merge this as is and post another PR to remove all of them.