This revision was automatically updated to reflect the committed changes.
Closed by commit rG6cd4a4cd02db: [lldb] Pass reference instead of pointer in
protected SBAddress methods. (authored by JDevlieghere).
Herald added a project: LLDB.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D88249/new/
https://reviews.llvm.org/D88249
Files:
lldb/include/lldb/API/SBAddress.h
lldb/source/API/SBAddress.cpp
lldb/source/API/SBBreakpointLocation.cpp
lldb/source/API/SBFrame.cpp
lldb/source/API/SBFunction.cpp
lldb/source/API/SBInstruction.cpp
lldb/source/API/SBLineEntry.cpp
lldb/source/API/SBQueueItem.cpp
lldb/source/API/SBSymbol.cpp
lldb/source/API/SBValue.cpp
Index: lldb/source/API/SBValue.cpp
===================================================================
--- lldb/source/API/SBValue.cpp
+++ lldb/source/API/SBValue.cpp
@@ -1356,7 +1356,7 @@
}
}
- return LLDB_RECORD_RESULT(SBAddress(new Address(addr)));
+ return LLDB_RECORD_RESULT(SBAddress(Address(addr)));
}
lldb::SBData SBValue::GetPointeeData(uint32_t item_idx, uint32_t item_count) {
Index: lldb/source/API/SBSymbol.cpp
===================================================================
--- lldb/source/API/SBSymbol.cpp
+++ lldb/source/API/SBSymbol.cpp
@@ -151,7 +151,7 @@
SBAddress addr;
if (m_opaque_ptr && m_opaque_ptr->ValueIsAddress()) {
- addr.SetAddress(&m_opaque_ptr->GetAddressRef());
+ addr.SetAddress(m_opaque_ptr->GetAddressRef());
}
return LLDB_RECORD_RESULT(addr);
}
@@ -163,7 +163,7 @@
if (m_opaque_ptr && m_opaque_ptr->ValueIsAddress()) {
lldb::addr_t range_size = m_opaque_ptr->GetByteSize();
if (range_size > 0) {
- addr.SetAddress(&m_opaque_ptr->GetAddressRef());
+ addr.SetAddress(m_opaque_ptr->GetAddressRef());
addr->Slide(m_opaque_ptr->GetByteSize());
}
}
Index: lldb/source/API/SBQueueItem.cpp
===================================================================
--- lldb/source/API/SBQueueItem.cpp
+++ lldb/source/API/SBQueueItem.cpp
@@ -80,7 +80,7 @@
SBAddress result;
if (m_queue_item_sp) {
- result.SetAddress(&m_queue_item_sp->GetAddress());
+ result.SetAddress(m_queue_item_sp->GetAddress());
}
return LLDB_RECORD_RESULT(result);
}
Index: lldb/source/API/SBLineEntry.cpp
===================================================================
--- lldb/source/API/SBLineEntry.cpp
+++ lldb/source/API/SBLineEntry.cpp
@@ -56,7 +56,7 @@
SBAddress sb_address;
if (m_opaque_up)
- sb_address.SetAddress(&m_opaque_up->range.GetBaseAddress());
+ sb_address.SetAddress(m_opaque_up->range.GetBaseAddress());
return LLDB_RECORD_RESULT(sb_address);
}
@@ -66,7 +66,7 @@
SBAddress sb_address;
if (m_opaque_up) {
- sb_address.SetAddress(&m_opaque_up->range.GetBaseAddress());
+ sb_address.SetAddress(m_opaque_up->range.GetBaseAddress());
sb_address.OffsetAddress(m_opaque_up->range.GetByteSize());
}
return LLDB_RECORD_RESULT(sb_address);
Index: lldb/source/API/SBInstruction.cpp
===================================================================
--- lldb/source/API/SBInstruction.cpp
+++ lldb/source/API/SBInstruction.cpp
@@ -107,7 +107,7 @@
SBAddress sb_addr;
lldb::InstructionSP inst_sp(GetOpaque());
if (inst_sp && inst_sp->GetAddress().IsValid())
- sb_addr.SetAddress(&inst_sp->GetAddress());
+ sb_addr.SetAddress(inst_sp->GetAddress());
return LLDB_RECORD_RESULT(sb_addr);
}
Index: lldb/source/API/SBFunction.cpp
===================================================================
--- lldb/source/API/SBFunction.cpp
+++ lldb/source/API/SBFunction.cpp
@@ -152,7 +152,7 @@
SBAddress addr;
if (m_opaque_ptr)
- addr.SetAddress(&m_opaque_ptr->GetAddressRange().GetBaseAddress());
+ addr.SetAddress(m_opaque_ptr->GetAddressRange().GetBaseAddress());
return LLDB_RECORD_RESULT(addr);
}
@@ -163,7 +163,7 @@
if (m_opaque_ptr) {
addr_t byte_size = m_opaque_ptr->GetAddressRange().GetByteSize();
if (byte_size > 0) {
- addr.SetAddress(&m_opaque_ptr->GetAddressRange().GetBaseAddress());
+ addr.SetAddress(m_opaque_ptr->GetAddressRange().GetBaseAddress());
addr->Slide(byte_size);
}
}
Index: lldb/source/API/SBFrame.cpp
===================================================================
--- lldb/source/API/SBFrame.cpp
+++ lldb/source/API/SBFrame.cpp
@@ -431,7 +431,7 @@
if (stop_locker.TryLock(&process->GetRunLock())) {
frame = exe_ctx.GetFramePtr();
if (frame)
- sb_addr.SetAddress(&frame->GetFrameCodeAddress());
+ sb_addr.SetAddress(frame->GetFrameCodeAddress());
}
}
return LLDB_RECORD_RESULT(sb_addr);
Index: lldb/source/API/SBBreakpointLocation.cpp
===================================================================
--- lldb/source/API/SBBreakpointLocation.cpp
+++ lldb/source/API/SBBreakpointLocation.cpp
@@ -80,7 +80,7 @@
BreakpointLocationSP loc_sp = GetSP();
if (loc_sp) {
- return LLDB_RECORD_RESULT(SBAddress(&loc_sp->GetAddress()));
+ return LLDB_RECORD_RESULT(SBAddress(loc_sp->GetAddress()));
}
return LLDB_RECORD_RESULT(SBAddress());
@@ -218,8 +218,8 @@
const char *callback_function_name,
SBStructuredData &extra_args) {
LLDB_RECORD_METHOD(SBError, SBBreakpointLocation, SetScriptCallbackFunction,
- (const char *, SBStructuredData &),
- callback_function_name, extra_args);
+ (const char *, SBStructuredData &), callback_function_name,
+ extra_args);
SBError sb_error;
BreakpointLocationSP loc_sp = GetSP();
@@ -239,7 +239,7 @@
sb_error.SetError(error);
} else
sb_error.SetErrorString("invalid breakpoint");
-
+
return LLDB_RECORD_RESULT(sb_error);
}
Index: lldb/source/API/SBAddress.cpp
===================================================================
--- lldb/source/API/SBAddress.cpp
+++ lldb/source/API/SBAddress.cpp
@@ -25,11 +25,8 @@
LLDB_RECORD_CONSTRUCTOR_NO_ARGS(SBAddress);
}
-SBAddress::SBAddress(const Address *lldb_object_ptr)
- : m_opaque_up(new Address()) {
- if (lldb_object_ptr)
- m_opaque_up = std::make_unique<Address>(*lldb_object_ptr);
-}
+SBAddress::SBAddress(const Address &address)
+ : m_opaque_up(std::make_unique<Address>(address)) {}
SBAddress::SBAddress(const SBAddress &rhs) : m_opaque_up(new Address()) {
LLDB_RECORD_CONSTRUCTOR(SBAddress, (const lldb::SBAddress &), rhs);
@@ -101,12 +98,7 @@
addr.SetOffset(offset);
}
-void SBAddress::SetAddress(const Address *lldb_object_ptr) {
- if (lldb_object_ptr)
- ref() = *lldb_object_ptr;
- else
- m_opaque_up = std::make_unique<Address>();
-}
+void SBAddress::SetAddress(const Address &address) { ref() = address; }
lldb::addr_t SBAddress::GetFileAddress() const {
LLDB_RECORD_METHOD_CONST_NO_ARGS(lldb::addr_t, SBAddress, GetFileAddress);
Index: lldb/include/lldb/API/SBAddress.h
===================================================================
--- lldb/include/lldb/API/SBAddress.h
+++ lldb/include/lldb/API/SBAddress.h
@@ -115,9 +115,9 @@
const lldb_private::Address &ref() const;
- SBAddress(const lldb_private::Address *lldb_object_ptr);
+ SBAddress(const lldb_private::Address &address);
- void SetAddress(const lldb_private::Address *lldb_object_ptr);
+ void SetAddress(const lldb_private::Address &address);
private:
std::unique_ptr<lldb_private::Address> m_opaque_up;
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
