Skip to content

Commit 52c08d7

Browse files
committed
Revert "[lldb] Change lldb's breakpoint handling behavior (#96260)"
This reverts commit 05f0e86. The debuginfo dexter tests are failing, probably because the way stepping over breakpoints has changed with my patches. And there are two API tests fails on the ubuntu-arm (32-bit) bot. I'll need to investigate both of these, neither has an obvious failure reason.
1 parent a3ebb66 commit 52c08d7

File tree

9 files changed

+265
-266
lines changed

9 files changed

+265
-266
lines changed

lldb/include/lldb/Target/Thread.h

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ class Thread : public std::enable_shared_from_this<Thread>,
129129
register_backup_sp; // You need to restore the registers, of course...
130130
uint32_t current_inlined_depth;
131131
lldb::addr_t current_inlined_pc;
132-
lldb::addr_t stopped_at_unexecuted_bp;
133132
};
134133

135134
/// Constructor
@@ -379,26 +378,6 @@ class Thread : public std::enable_shared_from_this<Thread>,
379378

380379
virtual void SetQueueLibdispatchQueueAddress(lldb::addr_t dispatch_queue_t) {}
381380

382-
/// When a thread stops at an enabled BreakpointSite that has not executed,
383-
/// the Process plugin should call SetThreadStoppedAtUnexecutedBP(pc).
384-
/// If that BreakpointSite was actually triggered (the instruction was
385-
/// executed, for a software breakpoint), regardless of whether the
386-
/// breakpoint is valid for this thread, SetThreadHitBreakpointSite()
387-
/// should be called to record that fact.
388-
///
389-
/// Depending on the structure of the Process plugin, it may be easiest
390-
/// to call SetThreadStoppedAtUnexecutedBP(pc) unconditionally when at
391-
/// a BreakpointSite, and later when it is known that it was triggered,
392-
/// SetThreadHitBreakpointSite() can be called. These two methods
393-
/// overwrite the same piece of state in the Thread, the last one
394-
/// called on a Thread wins.
395-
void SetThreadStoppedAtUnexecutedBP(lldb::addr_t pc) {
396-
m_stopped_at_unexecuted_bp = pc;
397-
}
398-
void SetThreadHitBreakpointSite() {
399-
m_stopped_at_unexecuted_bp = LLDB_INVALID_ADDRESS;
400-
}
401-
402381
/// Whether this Thread already has all the Queue information cached or not
403382
///
404383
/// A Thread may be associated with a libdispatch work Queue at a given
@@ -1333,9 +1312,6 @@ class Thread : public std::enable_shared_from_this<Thread>,
13331312
bool m_should_run_before_public_stop; // If this thread has "stop others"
13341313
// private work to do, then it will
13351314
// set this.
1336-
lldb::addr_t m_stopped_at_unexecuted_bp; // Set to the address of a breakpoint
1337-
// instruction that we have not yet
1338-
// hit, but will hit when we resume.
13391315
const uint32_t m_index_id; ///< A unique 1 based index assigned to each thread
13401316
/// for easy UI/command line access.
13411317
lldb::RegisterContextSP m_reg_context_sp; ///< The register context for this

0 commit comments

Comments
 (0)