Skip to content

Commit d912f94

Browse files
committed
Improve wording of progress update.
... assuming that nobody outside of LLDB developers knows what a "compile unit import" is.
1 parent 6c14611 commit d912f94

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8829,9 +8829,9 @@ bool SwiftASTContext::GetCompileUnitImportsImpl(
88298829
if (cu_imports.size() == 0)
88308830
return true;
88318831

8832-
Progress progress("Getting Swift compile unit imports",
8833-
compile_unit->GetPrimaryFile().GetFilename().GetCString(),
8834-
cu_imports.size());
8832+
std::string category = "Importing Swift module dependencies for ";
8833+
category += compile_unit->GetPrimaryFile().GetFilename();
8834+
Progress progress(category, "", cu_imports.size());
88358835
size_t completion = 0;
88368836
for (const SourceModule &module : cu_imports) {
88378837
progress.Increment(++completion, module.path.back().GetStringRef().str());

lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/TestSwiftProgressReporting.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,16 @@ def test_swift_progress_report(self):
3838
"Loading Swift module",
3939
"Importing modules used in expression",
4040
"Setting up Swift reflection",
41-
"Getting Swift compile unit imports",
41+
"Importing Swift module dependencies for main.swift",
4242
"Importing Swift modules",
4343
"Importing Swift standard library",
4444
]
4545

4646
while len(beacons):
4747
event = lldbutil.fetch_next_event(self, self.listener, self.broadcaster)
4848
ret_args = lldb.SBDebugger.GetProgressFromEvent(event)
49+
if self.TraceOn():
50+
print(ret_args[0])
4951

5052
for beacon in beacons:
5153
if beacon in ret_args[0]:

0 commit comments

Comments
 (0)