Skip to content

[lldb] Fix crash in BreakpointSite::BumpHitCounts #166876

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 3 commits into from
Nov 10, 2025
Merged

[lldb] Fix crash in BreakpointSite::BumpHitCounts #166876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38d0bd2
[lldb] Fix crash in BreakpointSite::BumpHitCounts
JDevlieghere Nov 7, 2025
ffccec4
Merge branch 'main' into rdar163760832
JDevlieghere Nov 7, 2025
ea20d27
Make the BreakpointLocationCollection mutex recursive
JDevlieghere Nov 10, 2025
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
10 changes: 6 additions & 4 deletions lldb/include/lldb/Breakpoint/BreakpointLocationCollection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ class BreakpointLocationCollection {

~BreakpointLocationCollection();

BreakpointLocationCollection &operator=(const BreakpointLocationCollection &rhs);
BreakpointLocationCollection &
operator=(const BreakpointLocationCollection &rhs);

/// Add the breakpoint \a bp_loc_sp to the list.
///
Expand Down Expand Up @@ -172,17 +173,18 @@ class BreakpointLocationCollection {
lldb::break_id_t break_loc_id) const;

collection m_break_loc_collection;
mutable std::mutex m_collection_mutex;
mutable std::recursive_mutex m_collection_mutex;
/// These are used if we're preserving breakpoints in this list:
const bool m_preserving_bkpts = false;
std::map<std::pair<lldb::break_id_t, lldb::break_id_t>, lldb::BreakpointSP>
m_preserved_bps;

public:
typedef llvm::iterator_range<collection::const_iterator>
typedef LockingAdaptedIterable<std::recursive_mutex, collection>
BreakpointLocationCollectionIterable;
BreakpointLocationCollectionIterable BreakpointLocations() {
return BreakpointLocationCollectionIterable(m_break_loc_collection);
return BreakpointLocationCollectionIterable(m_break_loc_collection,
m_collection_mutex);
}
};
} // namespace lldb_private
Expand Down
20 changes: 11 additions & 9 deletions lldb/source/Breakpoint/BreakpointLocationCollection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ BreakpointLocationCollection::BreakpointLocationCollection(bool preserving)
BreakpointLocationCollection::~BreakpointLocationCollection() = default;

void BreakpointLocationCollection::Add(const BreakpointLocationSP &bp_loc) {
std::lock_guard<std::mutex> guard(m_collection_mutex);
std::lock_guard<std::recursive_mutex> guard(m_collection_mutex);
BreakpointLocationSP old_bp_loc =
FindByIDPair(bp_loc->GetBreakpoint().GetID(), bp_loc->GetID());
if (!old_bp_loc.get()) {
Expand All @@ -44,7 +44,7 @@ void BreakpointLocationCollection::Add(const BreakpointLocationSP &bp_loc) {

bool BreakpointLocationCollection::Remove(lldb::break_id_t bp_id,
lldb::break_id_t bp_loc_id) {
std::lock_guard<std::mutex> guard(m_collection_mutex);
std::lock_guard<std::recursive_mutex> guard(m_collection_mutex);
collection::iterator pos = GetIDPairIterator(bp_id, bp_loc_id); // Predicate
if (pos != m_break_loc_collection.end()) {
if (m_preserving_bkpts) {
Expand Down Expand Up @@ -117,7 +117,7 @@ const BreakpointLocationSP BreakpointLocationCollection::FindByIDPair(
}

BreakpointLocationSP BreakpointLocationCollection::GetByIndex(size_t i) {
std::lock_guard<std::mutex> guard(m_collection_mutex);
std::lock_guard<std::recursive_mutex> guard(m_collection_mutex);
BreakpointLocationSP stop_sp;
if (i < m_break_loc_collection.size())
stop_sp = m_break_loc_collection[i];
Expand All @@ -127,7 +127,7 @@ BreakpointLocationSP BreakpointLocationCollection::GetByIndex(size_t i) {

const BreakpointLocationSP
BreakpointLocationCollection::GetByIndex(size_t i) const {
std::lock_guard<std::mutex> guard(m_collection_mutex);
std::lock_guard<std::recursive_mutex> guard(m_collection_mutex);
BreakpointLocationSP stop_sp;
if (i < m_break_loc_collection.size())
stop_sp = m_break_loc_collection[i];
Expand Down Expand Up @@ -168,7 +168,7 @@ bool BreakpointLocationCollection::ShouldStop(
}

bool BreakpointLocationCollection::ValidForThisThread(Thread &thread) {
std::lock_guard<std::mutex> guard(m_collection_mutex);
std::lock_guard<std::recursive_mutex> guard(m_collection_mutex);
collection::iterator pos, begin = m_break_loc_collection.begin(),
end = m_break_loc_collection.end();

Expand All @@ -180,7 +180,7 @@ bool BreakpointLocationCollection::ValidForThisThread(Thread &thread) {
}

bool BreakpointLocationCollection::IsInternal() const {
std::lock_guard<std::mutex> guard(m_collection_mutex);
std::lock_guard<std::recursive_mutex> guard(m_collection_mutex);
collection::const_iterator pos, begin = m_break_loc_collection.begin(),
end = m_break_loc_collection.end();

Expand All @@ -197,7 +197,7 @@ bool BreakpointLocationCollection::IsInternal() const {

void BreakpointLocationCollection::GetDescription(
Stream *s, lldb::DescriptionLevel level) {
std::lock_guard<std::mutex> guard(m_collection_mutex);
std::lock_guard<std::recursive_mutex> guard(m_collection_mutex);
collection::iterator pos, begin = m_break_loc_collection.begin(),
end = m_break_loc_collection.end();

Expand All @@ -212,8 +212,10 @@ BreakpointLocationCollection &BreakpointLocationCollection::operator=(
const BreakpointLocationCollection &rhs) {
if (this != &rhs) {
std::lock(m_collection_mutex, rhs.m_collection_mutex);
std::lock_guard<std::mutex> lhs_guard(m_collection_mutex, std::adopt_lock);
std::lock_guard<std::mutex> rhs_guard(rhs.m_collection_mutex, std::adopt_lock);
std::lock_guard<std::recursive_mutex> lhs_guard(m_collection_mutex,
std::adopt_lock);
std::lock_guard<std::recursive_mutex> rhs_guard(rhs.m_collection_mutex,
std::adopt_lock);
m_break_loc_collection = rhs.m_break_loc_collection;
}
return *this;
Expand Down
Loading