Skip to content

Commit 50bf0bc

Browse files
committed
[lldb] Exclude "resume partial" prefix from demangled display name
1 parent e7cbbf7 commit 50bf0bc

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

lldb/source/Target/SwiftLanguageRuntimeNames.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,7 @@ SwiftLanguageRuntime::DemangleSymbolAsString(StringRef symbol, DemangleMode mode
641641
switch (mode) {
642642
case eSimplified:
643643
options = swift::Demangle::DemangleOptions::SimplifiedUIDemangleOptions();
644+
options.ShowAsyncResumePartial = false;
644645
break;
645646
case eTypeName:
646647
options.DisplayModuleNames = true;

lldb/test/API/lang/swift/async/stepping/step-in/TestSwiftStepInAsync.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ def test(self):
3232
# Run until the next `await` breakpoint.
3333
process.Continue()
3434
elif stop_reason == lldb.eStopReasonBreakpoint:
35-
caller_before = thread().frames[0].function.name
35+
caller_before = thread().frames[0].function.GetDisplayName()
3636
line_before = thread().frames[0].line_entry.line
3737
thread().StepInto()
38-
caller_after = thread().frames[1].function.name
38+
caller_after = thread().frames[1].function.GetDisplayName()
3939
line_after = thread().frames[0].line_entry.line
4040

4141
# Breakpoints on lines with an `await` may result in more than
@@ -54,10 +54,7 @@ def test(self):
5454
process.Continue()
5555
continue
5656

57-
# The entry function is missing this prefix dedicating resume functions.
58-
prefix = re.compile(r'^\([0-9]+\) (await|suspend) resume partial function for ')
59-
self.assertEqual(prefix.sub('', caller_after),
60-
prefix.sub('', caller_before))
57+
self.assertEqual(caller_after, caller_before)
6158
num_async_steps += 1
6259

6360
self.assertGreater(num_async_steps, 0)

0 commit comments

Comments
 (0)