Skip to content

Commit e545d43

Browse files
authored
Merge pull request #6840 from jimingham/frame-select-before-status
2 parents e16b5c6 + a7a06cf commit e545d43

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

lldb/source/Core/Debugger.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,8 +1664,10 @@ void Debugger::HandleProcessEvent(const EventSP &event_sp) {
16641664

16651665
// Display running state changes first before any STDIO
16661666
if (got_state_changed && !state_is_stopped) {
1667+
// This is a public stop which we are going to announce to the user, so
1668+
// we should force the most relevant frame selection here.
16671669
Process::HandleProcessStateChangedEvent(event_sp, output_stream_sp.get(),
1668-
DoNoSelectMostRelevantFrame,
1670+
SelectMostRelevantFrame,
16691671
pop_process_io_handler,
16701672
// BEGIN SWIFT
16711673
pop_command_interpreter
@@ -1709,7 +1711,7 @@ void Debugger::HandleProcessEvent(const EventSP &event_sp) {
17091711
// Now display any stopped state changes after any STDIO
17101712
if (got_state_changed && state_is_stopped) {
17111713
Process::HandleProcessStateChangedEvent(event_sp, output_stream_sp.get(),
1712-
DoNoSelectMostRelevantFrame,
1714+
SelectMostRelevantFrame,
17131715
pop_process_io_handler,
17141716
// BEGIN SWIFT
17151717
pop_command_interpreter

lldb/test/Shell/Recognizer/assert.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
# RUN: %lldb -b -s %s %t.out | FileCheck %s
1111
run
1212
# CHECK: thread #{{.*}}stop reason = hit program assert
13-
frame info
1413
# CHECK: frame #{{.*}}`main at assert.c
1514
frame recognizer info 0
1615
# CHECK: frame 0 is recognized by Assert StackFrame Recognizer

0 commit comments

Comments
 (0)