bulbazord created this revision.
bulbazord added reviewers: JDevlieghere, mib, jingham.
Herald added a project: All.
bulbazord requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
I removed ConstString from OptionValueProperties in 643ba926c1f6
<https://reviews.llvm.org/rG643ba926c1f618401c86dc37e659df795db2e1a0>, but
there are a few call sites that still create a ConstString as an
argument. I did not catch these initially because ConstString has an
implicit conversion method to StringRef.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D153673
Files:
lldb/source/Core/Debugger.cpp
lldb/source/Core/PluginManager.cpp
lldb/source/Target/Process.cpp
lldb/source/Target/Target.cpp
lldb/unittests/Interpreter/TestOptionValue.cpp
Index: lldb/unittests/Interpreter/TestOptionValue.cpp
===================================================================
--- lldb/unittests/Interpreter/TestOptionValue.cpp
+++ lldb/unittests/Interpreter/TestOptionValue.cpp
@@ -85,11 +85,10 @@
const bool is_global = false;
auto dict_sp = std::make_shared<OptionValueDictionary>(1 << eTypeUInt64);
- props_sp->AppendProperty(ConstString("dict"), "", is_global, dict_sp);
+ props_sp->AppendProperty("dict", "", is_global, dict_sp);
auto file_list_sp = std::make_shared<OptionValueFileSpecList>();
- props_sp->AppendProperty(ConstString("file-list"), "", is_global,
- file_list_sp);
+ props_sp->AppendProperty("file-list", "", is_global, file_list_sp);
return props_sp;
}
Index: lldb/source/Target/Target.cpp
===================================================================
--- lldb/source/Target/Target.cpp
+++ lldb/source/Target/Target.cpp
@@ -4112,7 +4112,7 @@
m_experimental_properties_up =
std::make_unique<TargetExperimentalProperties>();
m_collection_sp->AppendProperty(
- ConstString(Properties::GetExperimentalSettingsName()),
+ Properties::GetExperimentalSettingsName(),
"Experimental settings - setting these won't produce "
"errors if the setting is not present.",
true, m_experimental_properties_up->GetValueProperties());
@@ -4123,12 +4123,12 @@
m_experimental_properties_up =
std::make_unique<TargetExperimentalProperties>();
m_collection_sp->AppendProperty(
- ConstString(Properties::GetExperimentalSettingsName()),
+ Properties::GetExperimentalSettingsName(),
"Experimental settings - setting these won't produce "
"errors if the setting is not present.",
true, m_experimental_properties_up->GetValueProperties());
m_collection_sp->AppendProperty(
- ConstString("process"), "Settings specific to processes.", true,
+ "process", "Settings specific to processes.", true,
Process::GetGlobalProperties().GetValueProperties());
m_collection_sp->SetValueChangedCallback(
ePropertySaveObjectsDir, [this] { CheckJITObjectsDir(); });
Index: lldb/source/Target/Process.cpp
===================================================================
--- lldb/source/Target/Process.cpp
+++ lldb/source/Target/Process.cpp
@@ -167,7 +167,7 @@
std::make_shared<ProcessOptionValueProperties>(ConstString("process"));
m_collection_sp->Initialize(g_process_properties);
m_collection_sp->AppendProperty(
- ConstString("thread"), "Settings specific to threads.", true,
+ "thread", "Settings specific to threads.", true,
Thread::GetGlobalProperties().GetValueProperties());
} else {
m_collection_sp =
@@ -180,7 +180,7 @@
m_experimental_properties_up =
std::make_unique<ProcessExperimentalProperties>();
m_collection_sp->AppendProperty(
- ConstString(Properties::GetExperimentalSettingsName()),
+ Properties::GetExperimentalSettingsName(),
"Experimental settings - setting these won't produce "
"errors if the setting is not present.",
true, m_experimental_properties_up->GetValueProperties());
Index: lldb/source/Core/PluginManager.cpp
===================================================================
--- lldb/source/Core/PluginManager.cpp
+++ lldb/source/Core/PluginManager.cpp
@@ -1438,7 +1438,7 @@
lldb::OptionValuePropertiesSP parent_properties_sp(
debugger.GetValueProperties());
if (parent_properties_sp) {
- static ConstString g_property_name("plugin");
+ static constexpr llvm::StringLiteral g_property_name("plugin");
OptionValuePropertiesSP plugin_properties_sp =
parent_properties_sp->GetSubProperty(nullptr, g_property_name);
@@ -1471,7 +1471,7 @@
static lldb::OptionValuePropertiesSP GetDebuggerPropertyForPluginsOldStyle(
Debugger &debugger, ConstString plugin_type_name,
llvm::StringRef plugin_type_desc, bool can_create) {
- static ConstString g_property_name("plugin");
+ static constexpr llvm::StringLiteral g_property_name("plugin");
lldb::OptionValuePropertiesSP parent_properties_sp(
debugger.GetValueProperties());
if (parent_properties_sp) {
Index: lldb/source/Core/Debugger.cpp
===================================================================
--- lldb/source/Core/Debugger.cpp
+++ lldb/source/Core/Debugger.cpp
@@ -815,17 +815,17 @@
// LLDB will start querying them during construction.
m_collection_sp->Initialize(g_debugger_properties);
m_collection_sp->AppendProperty(
- ConstString("target"), "Settings specify to debugging targets.", true,
+ "target", "Settings specify to debugging targets.", true,
Target::GetGlobalProperties().GetValueProperties());
m_collection_sp->AppendProperty(
- ConstString("platform"), "Platform settings.", true,
+ "platform", "Platform settings.", true,
Platform::GetGlobalPlatformProperties().GetValueProperties());
m_collection_sp->AppendProperty(
- ConstString("symbols"), "Symbol lookup and cache settings.", true,
+ "symbols", "Symbol lookup and cache settings.", true,
ModuleList::GetGlobalModuleListProperties().GetValueProperties());
if (m_command_interpreter_up) {
m_collection_sp->AppendProperty(
- ConstString("interpreter"),
+ "interpreter",
"Settings specify to the debugger's command interpreter.", true,
m_command_interpreter_up->GetValueProperties());
}
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
