bulbazord created this revision.
bulbazord added reviewers: JDevlieghere, labath, jingham, mib, jasonmolenda.
Herald added a project: All.
bulbazord requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
There's no reason these strings need to be in the ConstString
StringPool, they're already string literals with static lifetime.
I plan on addressing other similar functions in follow up commits.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D147833
Files:
lldb/include/lldb/Breakpoint/Breakpoint.h
lldb/include/lldb/Breakpoint/Watchpoint.h
lldb/include/lldb/Core/DebuggerEvents.h
lldb/include/lldb/Target/Process.h
lldb/include/lldb/Target/Target.h
lldb/include/lldb/Target/Thread.h
lldb/include/lldb/Utility/Event.h
lldb/source/API/SBEvent.cpp
lldb/source/Breakpoint/Breakpoint.cpp
lldb/source/Breakpoint/Watchpoint.cpp
lldb/source/Core/DebuggerEvents.cpp
lldb/source/Target/Process.cpp
lldb/source/Target/Target.cpp
lldb/source/Target/Thread.cpp
lldb/source/Utility/Event.cpp
Index: lldb/source/Utility/Event.cpp
===================================================================
--- lldb/source/Utility/Event.cpp
+++ lldb/source/Utility/Event.cpp
@@ -114,12 +114,9 @@
EventDataBytes::~EventDataBytes() = default;
-ConstString EventDataBytes::GetFlavorString() {
- static ConstString g_flavor("EventDataBytes");
- return g_flavor;
-}
+const char *EventDataBytes::GetFlavorString() { return "EventDataBytes"; }
-ConstString EventDataBytes::GetFlavor() const {
+const char *EventDataBytes::GetFlavor() const {
return EventDataBytes::GetFlavorString();
}
@@ -182,6 +179,10 @@
m_bytes.swap(new_bytes);
}
+const char *EventDataReceipt::GetFlavorString() {
+ return "Process::ProcessEventData";
+}
+
#pragma mark -
#pragma mark EventStructuredData
@@ -200,7 +201,7 @@
// EventDataStructuredData member functions
-ConstString EventDataStructuredData::GetFlavor() const {
+const char *EventDataStructuredData::GetFlavor() const {
return EventDataStructuredData::GetFlavorString();
}
@@ -280,7 +281,6 @@
return StructuredDataPluginSP();
}
-ConstString EventDataStructuredData::GetFlavorString() {
- static ConstString s_flavor("EventDataStructuredData");
- return s_flavor;
+const char *EventDataStructuredData::GetFlavorString() {
+ return "EventDataStructuredData";
}
Index: lldb/source/Target/Thread.cpp
===================================================================
--- lldb/source/Target/Thread.cpp
+++ lldb/source/Target/Thread.cpp
@@ -150,9 +150,8 @@
// Thread Event Data
-ConstString Thread::ThreadEventData::GetFlavorString() {
- static ConstString g_flavor("Thread::ThreadEventData");
- return g_flavor;
+const char *Thread::ThreadEventData::GetFlavorString() {
+ return "Thread::ThreadEventData";
}
Thread::ThreadEventData::ThreadEventData(const lldb::ThreadSP thread_sp)
Index: lldb/source/Target/Target.cpp
===================================================================
--- lldb/source/Target/Target.cpp
+++ lldb/source/Target/Target.cpp
@@ -4786,9 +4786,8 @@
Target::TargetEventData::~TargetEventData() = default;
-ConstString Target::TargetEventData::GetFlavorString() {
- static ConstString g_flavor("Target::TargetEventData");
- return g_flavor;
+const char *Target::TargetEventData::GetFlavorString() {
+ return "Target::TargetEventData";
}
void Target::TargetEventData::Dump(Stream *s) const {
Index: lldb/source/Target/Process.cpp
===================================================================
--- lldb/source/Target/Process.cpp
+++ lldb/source/Target/Process.cpp
@@ -3929,12 +3929,11 @@
Process::ProcessEventData::~ProcessEventData() = default;
-ConstString Process::ProcessEventData::GetFlavorString() {
- static ConstString g_flavor("Process::ProcessEventData");
- return g_flavor;
+const char *Process::ProcessEventData::GetFlavorString() {
+ return "Process::ProcessEventData";
}
-ConstString Process::ProcessEventData::GetFlavor() const {
+const char *Process::ProcessEventData::GetFlavor() const {
return ProcessEventData::GetFlavorString();
}
Index: lldb/source/Core/DebuggerEvents.cpp
===================================================================
--- lldb/source/Core/DebuggerEvents.cpp
+++ lldb/source/Core/DebuggerEvents.cpp
@@ -23,12 +23,9 @@
return nullptr;
}
-ConstString ProgressEventData::GetFlavorString() {
- static ConstString g_flavor("ProgressEventData");
- return g_flavor;
-}
+const char *ProgressEventData::GetFlavorString() { return "ProgressEventData"; }
-ConstString ProgressEventData::GetFlavor() const {
+const char *ProgressEventData::GetFlavor() const {
return ProgressEventData::GetFlavorString();
}
@@ -94,12 +91,11 @@
s->Flush();
}
-ConstString DiagnosticEventData::GetFlavorString() {
- static ConstString g_flavor("DiagnosticEventData");
- return g_flavor;
+const char *DiagnosticEventData::GetFlavorString() {
+ return "DiagnosticEventData";
}
-ConstString DiagnosticEventData::GetFlavor() const {
+const char *DiagnosticEventData::GetFlavor() const {
return DiagnosticEventData::GetFlavorString();
}
@@ -124,12 +120,11 @@
return dictionary_sp;
}
-ConstString SymbolChangeEventData::GetFlavorString() {
- static ConstString g_flavor("SymbolChangeEventData");
- return g_flavor;
+const char *SymbolChangeEventData::GetFlavorString() {
+ return "SymbolChangeEventData";
}
-ConstString SymbolChangeEventData::GetFlavor() const {
+const char *SymbolChangeEventData::GetFlavor() const {
return SymbolChangeEventData::GetFlavorString();
}
Index: lldb/source/Breakpoint/Watchpoint.cpp
===================================================================
--- lldb/source/Breakpoint/Watchpoint.cpp
+++ lldb/source/Breakpoint/Watchpoint.cpp
@@ -337,12 +337,11 @@
Watchpoint::WatchpointEventData::~WatchpointEventData() = default;
-ConstString Watchpoint::WatchpointEventData::GetFlavorString() {
- static ConstString g_flavor("Watchpoint::WatchpointEventData");
- return g_flavor;
+const char *Watchpoint::WatchpointEventData::GetFlavorString() {
+ return "Watchpoint::WatchpointEventData";
}
-ConstString Watchpoint::WatchpointEventData::GetFlavor() const {
+const char *Watchpoint::WatchpointEventData::GetFlavor() const {
return WatchpointEventData::GetFlavorString();
}
Index: lldb/source/Breakpoint/Breakpoint.cpp
===================================================================
--- lldb/source/Breakpoint/Breakpoint.cpp
+++ lldb/source/Breakpoint/Breakpoint.cpp
@@ -1039,12 +1039,11 @@
Breakpoint::BreakpointEventData::~BreakpointEventData() = default;
-ConstString Breakpoint::BreakpointEventData::GetFlavorString() {
- static ConstString g_flavor("Breakpoint::BreakpointEventData");
- return g_flavor;
+const char *Breakpoint::BreakpointEventData::GetFlavorString() {
+ return "Breakpoint::BreakpointEventData";
}
-ConstString Breakpoint::BreakpointEventData::GetFlavor() const {
+const char *Breakpoint::BreakpointEventData::GetFlavor() const {
return BreakpointEventData::GetFlavorString();
}
Index: lldb/source/API/SBEvent.cpp
===================================================================
--- lldb/source/API/SBEvent.cpp
+++ lldb/source/API/SBEvent.cpp
@@ -63,7 +63,7 @@
if (lldb_event) {
EventData *event_data = lldb_event->GetData();
if (event_data)
- return lldb_event->GetData()->GetFlavor().AsCString();
+ return lldb_event->GetData()->GetFlavor();
}
return nullptr;
}
Index: lldb/include/lldb/Utility/Event.h
===================================================================
--- lldb/include/lldb/Utility/Event.h
+++ lldb/include/lldb/Utility/Event.h
@@ -41,8 +41,8 @@
virtual ~EventData();
- virtual ConstString GetFlavor() const = 0;
-
+ virtual const char *GetFlavor() const = 0;
+
virtual Log *GetLogChannel() { return nullptr; }
virtual void Dump(Stream *s) const;
@@ -69,7 +69,7 @@
~EventDataBytes() override;
// Member functions
- ConstString GetFlavor() const override;
+ const char *GetFlavor() const override;
void Dump(Stream *s) const override;
@@ -90,7 +90,7 @@
static size_t GetByteSizeFromEvent(const Event *event_ptr);
- static ConstString GetFlavorString();
+ static const char *GetFlavorString();
private:
std::string m_bytes;
@@ -105,12 +105,9 @@
~EventDataReceipt() override = default;
- static ConstString GetFlavorString() {
- static ConstString g_flavor("Process::ProcessEventData");
- return g_flavor;
- }
+ static const char *GetFlavorString();
- ConstString GetFlavor() const override { return GetFlavorString(); }
+ const char *GetFlavor() const override { return GetFlavorString(); }
bool WaitForEventReceived(const Timeout<std::micro> &timeout = std::nullopt) {
return m_predicate.WaitForValueEqualTo(true, timeout);
@@ -139,7 +136,7 @@
~EventDataStructuredData() override;
// Member functions
- ConstString GetFlavor() const override;
+ const char *GetFlavor() const override;
void Dump(Stream *s) const override;
@@ -166,7 +163,7 @@
static lldb::StructuredDataPluginSP
GetPluginFromEvent(const Event *event_ptr);
- static ConstString GetFlavorString();
+ static const char *GetFlavorString();
private:
lldb::ProcessSP m_process_sp;
Index: lldb/include/lldb/Target/Thread.h
===================================================================
--- lldb/include/lldb/Target/Thread.h
+++ lldb/include/lldb/Target/Thread.h
@@ -89,9 +89,9 @@
~ThreadEventData() override;
- static ConstString GetFlavorString();
+ static const char *GetFlavorString();
- ConstString GetFlavor() const override {
+ const char *GetFlavor() const override {
return ThreadEventData::GetFlavorString();
}
Index: lldb/include/lldb/Target/Target.h
===================================================================
--- lldb/include/lldb/Target/Target.h
+++ lldb/include/lldb/Target/Target.h
@@ -506,9 +506,9 @@
~TargetEventData() override;
- static ConstString GetFlavorString();
+ static const char *GetFlavorString();
- ConstString GetFlavor() const override {
+ const char *GetFlavor() const override {
return TargetEventData::GetFlavorString();
}
Index: lldb/include/lldb/Target/Process.h
===================================================================
--- lldb/include/lldb/Target/Process.h
+++ lldb/include/lldb/Target/Process.h
@@ -411,9 +411,9 @@
~ProcessEventData() override;
- static ConstString GetFlavorString();
+ static const char *GetFlavorString();
- ConstString GetFlavor() const override;
+ const char *GetFlavor() const override;
lldb::ProcessSP GetProcessSP() const { return m_process_wp.lock(); }
Index: lldb/include/lldb/Core/DebuggerEvents.h
===================================================================
--- lldb/include/lldb/Core/DebuggerEvents.h
+++ lldb/include/lldb/Core/DebuggerEvents.h
@@ -7,7 +7,6 @@
//===----------------------------------------------------------------------===//
#include "lldb/Core/ModuleSpec.h"
-#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/Event.h"
#include "lldb/Utility/StructuredData.h"
@@ -27,9 +26,9 @@
m_id(progress_id), m_completed(completed), m_total(total),
m_debugger_specific(debugger_specific) {}
- static ConstString GetFlavorString();
+ static const char *GetFlavorString();
- ConstString GetFlavor() const override;
+ const char *GetFlavor() const override;
void Dump(Stream *s) const override;
@@ -93,8 +92,8 @@
void Dump(Stream *s) const override;
- static ConstString GetFlavorString();
- ConstString GetFlavor() const override;
+ static const char *GetFlavorString();
+ const char *GetFlavor() const override;
static const DiagnosticEventData *
GetEventDataFromEvent(const Event *event_ptr);
@@ -116,8 +115,8 @@
SymbolChangeEventData(lldb::DebuggerWP debugger_wp, ModuleSpec module_spec)
: m_debugger_wp(debugger_wp), m_module_spec(std::move(module_spec)) {}
- static ConstString GetFlavorString();
- ConstString GetFlavor() const override;
+ static const char *GetFlavorString();
+ const char *GetFlavor() const override;
static const SymbolChangeEventData *
GetEventDataFromEvent(const Event *event_ptr);
Index: lldb/include/lldb/Breakpoint/Watchpoint.h
===================================================================
--- lldb/include/lldb/Breakpoint/Watchpoint.h
+++ lldb/include/lldb/Breakpoint/Watchpoint.h
@@ -31,9 +31,9 @@
~WatchpointEventData() override;
- static ConstString GetFlavorString();
+ static const char *GetFlavorString();
- ConstString GetFlavor() const override;
+ const char *GetFlavor() const override;
lldb::WatchpointEventType GetWatchpointEventType() const;
Index: lldb/include/lldb/Breakpoint/Breakpoint.h
===================================================================
--- lldb/include/lldb/Breakpoint/Breakpoint.h
+++ lldb/include/lldb/Breakpoint/Breakpoint.h
@@ -105,11 +105,11 @@
~BreakpointEventData() override;
- static ConstString GetFlavorString();
-
+ static const char *GetFlavorString();
+
Log *GetLogChannel() override;
- ConstString GetFlavor() const override;
+ const char *GetFlavor() const override;
lldb::BreakpointEventType GetBreakpointEventType() const;
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
