https://github.com/labath created
https://github.com/llvm/llvm-project/pull/134081
Replace with std::unique_ptr. Previous attempt at replacing them with values
failed because x86AssemblyInspectionEngine was storing pointers to the rows
while modifying the plan. Changing that is relatively easy, but I'm not sure if
that's an improvement.
>From d66923f92537c61dc3fc07032e17eb88e1d474c9 Mon Sep 17 00:00:00 2001
From: Pavel Labath <pa...@labath.sk>
Date: Wed, 2 Apr 2025 15:23:22 +0200
Subject: [PATCH] [lldb] Remove UnwindPlan::Row shared_ptrs, lite
Replace with std::unique_ptr. Previous attempt at replacing them with
values failed because x86AssemblyInspectionEngine was storing pointers
to the rows while modifying the plan. Changing that is relatively easy,
but I'm not sure if that's an improvement.
---
lldb/include/lldb/Symbol/UnwindPlan.h | 8 ++++----
lldb/source/Symbol/UnwindPlan.cpp | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lldb/include/lldb/Symbol/UnwindPlan.h
b/lldb/include/lldb/Symbol/UnwindPlan.h
index 9adda27b8f928..a0032d6e777c7 100644
--- a/lldb/include/lldb/Symbol/UnwindPlan.h
+++ b/lldb/include/lldb/Symbol/UnwindPlan.h
@@ -428,7 +428,7 @@ class UnwindPlan {
bool m_unspecified_registers_are_undefined = false;
}; // class Row
- typedef std::shared_ptr<Row> RowSP;
+ typedef std::unique_ptr<Row> RowUP;
UnwindPlan(lldb::RegisterKind reg_kind)
: m_register_kind(reg_kind), m_return_addr_register(LLDB_INVALID_REGNUM),
@@ -449,8 +449,8 @@ class UnwindPlan {
m_lsda_address(rhs.m_lsda_address),
m_personality_func_addr(rhs.m_personality_func_addr) {
m_row_list.reserve(rhs.m_row_list.size());
- for (const RowSP &row_sp : rhs.m_row_list)
- m_row_list.emplace_back(new Row(*row_sp));
+ for (const RowUP &row_up : rhs.m_row_list)
+ m_row_list.emplace_back(new Row(*row_up));
}
UnwindPlan(UnwindPlan &&rhs) = default;
UnwindPlan &operator=(const UnwindPlan &rhs) {
@@ -570,7 +570,7 @@ class UnwindPlan {
}
private:
- std::vector<RowSP> m_row_list;
+ std::vector<RowUP> m_row_list;
std::vector<AddressRange> m_plan_valid_ranges;
lldb::RegisterKind m_register_kind; // The RegisterKind these register
numbers
// are in terms of - will need to be
diff --git a/lldb/source/Symbol/UnwindPlan.cpp
b/lldb/source/Symbol/UnwindPlan.cpp
index f2846eb927bf8..6cf96e66a7771 100644
--- a/lldb/source/Symbol/UnwindPlan.cpp
+++ b/lldb/source/Symbol/UnwindPlan.cpp
@@ -392,16 +392,16 @@ bool UnwindPlan::Row::operator==(const UnwindPlan::Row
&rhs) const {
void UnwindPlan::AppendRow(Row row) {
if (m_row_list.empty() || m_row_list.back()->GetOffset() != row.GetOffset())
- m_row_list.push_back(std::make_shared<Row>(std::move(row)));
+ m_row_list.push_back(std::make_unique<Row>(std::move(row)));
else
*m_row_list.back() = std::move(row);
}
struct RowLess {
- bool operator()(addr_t a, const UnwindPlan::RowSP &b) const {
+ bool operator()(addr_t a, const UnwindPlan::RowUP &b) const {
return a < b->GetOffset();
}
- bool operator()(const UnwindPlan::RowSP &a, addr_t b) const {
+ bool operator()(const UnwindPlan::RowUP &a, addr_t b) const {
return a->GetOffset() < b;
}
};
@@ -409,7 +409,7 @@ struct RowLess {
void UnwindPlan::InsertRow(Row row, bool replace_existing) {
auto it = llvm::lower_bound(m_row_list, row.GetOffset(), RowLess());
if (it == m_row_list.end() || it->get()->GetOffset() > row.GetOffset())
- m_row_list.insert(it, std::make_shared<Row>(std::move(row)));
+ m_row_list.insert(it, std::make_unique<Row>(std::move(row)));
else {
assert(it->get()->GetOffset() == row.GetOffset());
if (replace_existing)
@@ -567,9 +567,9 @@ void UnwindPlan::Dump(Stream &s, Thread *thread,
lldb::addr_t base_addr) const {
range.Dump(&s, target_sp.get(), Address::DumpStyleSectionNameOffset);
s.EOL();
}
- for (const auto &[index, row_sp] : llvm::enumerate(m_row_list)) {
+ for (const auto &[index, row_up] : llvm::enumerate(m_row_list)) {
s.Format("row[{0}]: ", index);
- row_sp->Dump(s, this, thread, base_addr);
+ row_up->Dump(s, this, thread, base_addr);
s << "\n";
}
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
