diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h --- a/lldb/include/lldb/Target/Process.h +++ b/lldb/include/lldb/Target/Process.h @@ -2537,7 +2537,7 @@ /// \return /// Returns the result of attempting to configure the feature. virtual Status - ConfigureStructuredData(ConstString type_name, + ConfigureStructuredData(llvm::StringRef type_name, const StructuredData::ObjectSP &config_sp); /// Broadcasts the given structured data object from the given plugin. diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h @@ -211,7 +211,7 @@ lldb::addr_t image_count) override; Status - ConfigureStructuredData(ConstString type_name, + ConfigureStructuredData(llvm::StringRef type_name, const StructuredData::ObjectSP &config_sp) override; StructuredData::ObjectSP GetLoadedDynamicLibrariesInfos() override; diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -3922,7 +3922,7 @@ } Status ProcessGDBRemote::ConfigureStructuredData( - ConstString type_name, const StructuredData::ObjectSP &config_sp) { + llvm::StringRef type_name, const StructuredData::ObjectSP &config_sp) { return m_gdb_comm.ConfigureRemoteStructuredData(type_name, config_sp); } diff --git a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp --- a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp +++ b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp @@ -822,8 +822,8 @@ // Send configuration to the feature by way of the process. Construct the // options we will use. auto config_sp = m_options_sp->BuildConfigurationData(m_enable); - const Status error = process_sp->ConfigureStructuredData( - ConstString(GetDarwinLogTypeName()), config_sp); + const Status error = + process_sp->ConfigureStructuredData(GetDarwinLogTypeName(), config_sp); // Report results. if (!error.Success()) { @@ -1831,8 +1831,8 @@ // We can run it directly. // Send configuration to the feature by way of the process. - const Status error = process_sp->ConfigureStructuredData( - ConstString(GetDarwinLogTypeName()), config_sp); + const Status error = + process_sp->ConfigureStructuredData(GetDarwinLogTypeName(), config_sp); // Report results. if (!error.Success()) { diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -6007,7 +6007,7 @@ } Status -Process::ConfigureStructuredData(ConstString type_name, +Process::ConfigureStructuredData(llvm::StringRef type_name, const StructuredData::ObjectSP &config_sp) { // If you get this, the Process-derived class needs to implement a method to // enable an already-reported asynchronous structured data feature. See