Skip to content

[lldb] correct inconsistent order of messages on process launch #73173

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.

Sign up for GitHub

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
merged 2 commits into from
Nov 24, 2023
Merged

[lldb] correct inconsistent order of messages on process launch #73173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e451fe7
[lldb] correct inconsistent order of messages on process launch
junior-jl Nov 22, 2023
42c29e9
fixup! [lldb] correct inconsistent order of messages on process launch
junior-jl Nov 23, 2023
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
8 changes: 5 additions & 3 deletions lldb/source/Commands/CommandObjectProcess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,6 @@ class CommandObjectProcessLaunch : public CommandObjectProcessLaunchOrAttach {
// PushProcessIOHandler().
process_sp->SyncIOHandler(0, std::chrono::seconds(2));

llvm::StringRef data = stream.GetString();
if (!data.empty())
result.AppendMessage(data);
// If we didn't have a local executable, then we wouldn't have had an
// executable module before launch.
if (!exe_module_sp)
Expand All @@ -282,6 +279,11 @@ class CommandObjectProcessLaunch : public CommandObjectProcessLaunchOrAttach {
exe_module_sp->GetFileSpec().GetPath().c_str(), archname);
}
result.SetStatus(eReturnStatusSuccessFinishResult);
// This message will refer to an event that happened after the process
// launched.
llvm::StringRef data = stream.GetString();
if (!data.empty())
result.AppendMessage(data);
result.SetDidChangeProcessState(true);
} else {
result.AppendError(
Expand Down
2 changes: 1 addition & 1 deletion lldb/test/Shell/Breakpoint/jit-loader_jitlink_elf.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

# CHECK: Breakpoint 1: no locations (pending).
# CHECK: (lldb) run {{.*}}
# CHECK: Process {{.*}} launched: {{.*}}
# CHECK: Process {{.*}} stopped
# CHECK: JIT(0x{{.*}})`jitbp() at jitbp.cpp:1:15
# CHECK: -> 1 int jitbp() { return 0; }
# CHECK: ^
# CHECK: 2 int main() { return jitbp(); }
# CHECK: Process {{.*}} launched: {{.*}}
2 changes: 1 addition & 1 deletion lldb/test/Shell/Breakpoint/jit-loader_rtdyld_elf.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

# CHECK: Breakpoint 1: no locations (pending).
# CHECK: (lldb) run {{.*}}
# CHECK: Process {{.*}} launched: {{.*}}
# CHECK: Process {{.*}} stopped
# CHECK: JIT(0x{{.*}})`jitbp() at jitbp.cpp:1:15
# CHECK: -> 1 int jitbp() { return 0; }
# CHECK: ^
# CHECK: 2 int main() { return jitbp(); }
# CHECK: Process {{.*}} launched: {{.*}}