https://github.com/bulbazord updated https://github.com/llvm/llvm-project/pull/205910
>From f3a6347633cf4ded9bd9b198b840f7165136e681 Mon Sep 17 00:00:00 2001 From: Alex Langford <[email protected]> Date: Thu, 25 Jun 2026 11:32:31 -0700 Subject: [PATCH 1/2] [lldb] Replace ConstString with std::string in BreakpointName --- lldb/include/lldb/Breakpoint/BreakpointName.h | 6 +++--- lldb/source/Target/Target.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lldb/include/lldb/Breakpoint/BreakpointName.h b/lldb/include/lldb/Breakpoint/BreakpointName.h index 6ddca88644e46..f046a6b686568 100644 --- a/lldb/include/lldb/Breakpoint/BreakpointName.h +++ b/lldb/include/lldb/Breakpoint/BreakpointName.h @@ -137,7 +137,7 @@ class BreakpointName { } }; - BreakpointName(ConstString name, const char *help = nullptr) : + BreakpointName(llvm::StringRef name, const char *help = nullptr) : m_name(name), m_options(false) { SetHelp(help); @@ -148,7 +148,7 @@ class BreakpointName { m_permissions(rhs.m_permissions), m_help(rhs.m_help) {} - ConstString GetName() const { return m_name; } + llvm::StringRef GetName() const { return m_name; } BreakpointOptions &GetOptions() { return m_options; } const BreakpointOptions &GetOptions() const { return m_options; } @@ -186,7 +186,7 @@ class BreakpointName { void ConfigureBreakpoint(lldb::BreakpointSP bp_sp); private: - ConstString m_name; + std::string m_name; BreakpointOptions m_options; Permissions m_permissions; std::string m_help; diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index ea5d203a90266..3eab405969a21 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -930,7 +930,7 @@ void Target::ConfigureBreakpointName( void Target::ApplyNameToBreakpoints(BreakpointName &bp_name) { llvm::Expected<std::vector<BreakpointSP>> expected_vector = - m_breakpoint_list.FindBreakpointsByName(bp_name.GetName().GetStringRef()); + m_breakpoint_list.FindBreakpointsByName(bp_name.GetName()); if (!expected_vector) { LLDB_LOG(GetLog(LLDBLog::Breakpoints), "invalid breakpoint name: {}", >From 0617a5cfbb24e2392e509ad692d62edea8776b57 Mon Sep 17 00:00:00 2001 From: Alex Langford <[email protected]> Date: Thu, 25 Jun 2026 13:49:13 -0700 Subject: [PATCH 2/2] formatting --- lldb/include/lldb/Breakpoint/BreakpointName.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lldb/include/lldb/Breakpoint/BreakpointName.h b/lldb/include/lldb/Breakpoint/BreakpointName.h index f046a6b686568..fd1ee61ce1994 100644 --- a/lldb/include/lldb/Breakpoint/BreakpointName.h +++ b/lldb/include/lldb/Breakpoint/BreakpointName.h @@ -137,11 +137,10 @@ class BreakpointName { } }; - BreakpointName(llvm::StringRef name, const char *help = nullptr) : - m_name(name), m_options(false) - { - SetHelp(help); - } + BreakpointName(llvm::StringRef name, const char *help = nullptr) + : m_name(name), m_options(false) { + SetHelp(help); + } BreakpointName(const BreakpointName &rhs) : m_name(rhs.m_name), m_options(rhs.m_options), @@ -186,10 +185,10 @@ class BreakpointName { void ConfigureBreakpoint(lldb::BreakpointSP bp_sp); private: - std::string m_name; - BreakpointOptions m_options; - Permissions m_permissions; - std::string m_help; + std::string m_name; + BreakpointOptions m_options; + Permissions m_permissions; + std::string m_help; }; } // namespace lldb_private _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
