diff --git a/lldb/include/lldb/Core/PluginManager.h b/lldb/include/lldb/Core/PluginManager.h --- a/lldb/include/lldb/Core/PluginManager.h +++ b/lldb/include/lldb/Core/PluginManager.h @@ -481,46 +481,46 @@ static bool CreateSettingForDynamicLoaderPlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property); + llvm::StringRef description, bool is_global_property); static lldb::OptionValuePropertiesSP GetSettingForPlatformPlugin(Debugger &debugger, ConstString setting_name); static bool CreateSettingForPlatformPlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property); + llvm::StringRef description, bool is_global_property); static lldb::OptionValuePropertiesSP GetSettingForProcessPlugin(Debugger &debugger, ConstString setting_name); static bool CreateSettingForProcessPlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property); + llvm::StringRef description, bool is_global_property); static bool CreateSettingForTracePlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property); + llvm::StringRef description, bool is_global_property); static lldb::OptionValuePropertiesSP GetSettingForObjectFilePlugin(Debugger &debugger, ConstString setting_name); static bool CreateSettingForObjectFilePlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property); + llvm::StringRef description, bool is_global_property); static lldb::OptionValuePropertiesSP GetSettingForSymbolFilePlugin(Debugger &debugger, ConstString setting_name); static bool CreateSettingForSymbolFilePlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property); + llvm::StringRef description, bool is_global_property); static lldb::OptionValuePropertiesSP GetSettingForJITLoaderPlugin(Debugger &debugger, ConstString setting_name); static bool CreateSettingForJITLoaderPlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property); + llvm::StringRef description, bool is_global_property); static lldb::OptionValuePropertiesSP GetSettingForOperatingSystemPlugin(Debugger &debugger, @@ -528,7 +528,7 @@ static bool CreateSettingForOperatingSystemPlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property); + llvm::StringRef description, bool is_global_property); static lldb::OptionValuePropertiesSP GetSettingForStructuredDataPlugin(Debugger &debugger, @@ -536,7 +536,7 @@ static bool CreateSettingForStructuredDataPlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property); + llvm::StringRef description, bool is_global_property); }; } // namespace lldb_private diff --git a/lldb/include/lldb/Interpreter/OptionValueProperties.h b/lldb/include/lldb/Interpreter/OptionValueProperties.h --- a/lldb/include/lldb/Interpreter/OptionValueProperties.h +++ b/lldb/include/lldb/Interpreter/OptionValueProperties.h @@ -197,8 +197,8 @@ OptionValueFileSpecList *GetPropertyAtIndexAsOptionValueFileSpecList( const ExecutionContext *exe_ctx, bool will_modify, uint32_t idx) const; - void AppendProperty(ConstString name, ConstString desc, - bool is_global, const lldb::OptionValueSP &value_sp); + void AppendProperty(ConstString name, llvm::StringRef desc, bool is_global, + const lldb::OptionValueSP &value_sp); lldb::OptionValuePropertiesSP GetSubProperty(const ExecutionContext *exe_ctx, ConstString name); diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp --- a/lldb/source/Core/Debugger.cpp +++ b/lldb/source/Core/Debugger.cpp @@ -812,20 +812,19 @@ m_collection_sp->Initialize(g_debugger_properties); m_collection_sp->AppendProperty( - ConstString("target"), - ConstString("Settings specify to debugging targets."), true, + ConstString("target"), "Settings specify to debugging targets.", true, Target::GetGlobalProperties().GetValueProperties()); m_collection_sp->AppendProperty( - ConstString("platform"), ConstString("Platform settings."), true, + ConstString("platform"), "Platform settings.", true, Platform::GetGlobalPlatformProperties().GetValueProperties()); m_collection_sp->AppendProperty( - ConstString("symbols"), ConstString("Symbol lookup and cache settings."), - true, ModuleList::GetGlobalModuleListProperties().GetValueProperties()); + ConstString("symbols"), "Symbol lookup and cache settings.", true, + ModuleList::GetGlobalModuleListProperties().GetValueProperties()); if (m_command_interpreter_up) { m_collection_sp->AppendProperty( ConstString("interpreter"), - ConstString("Settings specify to the debugger's command interpreter."), - true, m_command_interpreter_up->GetValueProperties()); + "Settings specify to the debugger's command interpreter.", true, + m_command_interpreter_up->GetValueProperties()); } OptionValueSInt64 *term_width = m_collection_sp->GetPropertyAtIndexAsOptionValueSInt64( diff --git a/lldb/source/Core/PluginManager.cpp b/lldb/source/Core/PluginManager.cpp --- a/lldb/source/Core/PluginManager.cpp +++ b/lldb/source/Core/PluginManager.cpp @@ -1433,7 +1433,8 @@ // "plugin...SETTINGNAME". static lldb::OptionValuePropertiesSP GetDebuggerPropertyForPlugins(Debugger &debugger, ConstString plugin_type_name, - ConstString plugin_type_desc, bool can_create) { + llvm::StringRef plugin_type_desc, + bool can_create) { lldb::OptionValuePropertiesSP parent_properties_sp( debugger.GetValueProperties()); if (parent_properties_sp) { @@ -1444,9 +1445,9 @@ if (!plugin_properties_sp && can_create) { plugin_properties_sp = std::make_shared(g_property_name); - parent_properties_sp->AppendProperty( - g_property_name, ConstString("Settings specify to plugins."), true, - plugin_properties_sp); + parent_properties_sp->AppendProperty(g_property_name, + "Settings specify to plugins.", true, + plugin_properties_sp); } if (plugin_properties_sp) { @@ -1469,7 +1470,7 @@ // generic settings would be under "platform.SETTINGNAME". static lldb::OptionValuePropertiesSP GetDebuggerPropertyForPluginsOldStyle( Debugger &debugger, ConstString plugin_type_name, - ConstString plugin_type_desc, bool can_create) { + llvm::StringRef plugin_type_desc, bool can_create) { static ConstString g_property_name("plugin"); lldb::OptionValuePropertiesSP parent_properties_sp( debugger.GetValueProperties()); @@ -1489,9 +1490,9 @@ if (!plugin_type_properties_sp && can_create) { plugin_type_properties_sp = std::make_shared(g_property_name); - plugin_properties_sp->AppendProperty( - g_property_name, ConstString("Settings specific to plugins"), true, - plugin_type_properties_sp); + plugin_properties_sp->AppendProperty(g_property_name, + "Settings specific to plugins", + true, plugin_type_properties_sp); } return plugin_type_properties_sp; } @@ -1502,7 +1503,7 @@ namespace { typedef lldb::OptionValuePropertiesSP -GetDebuggerPropertyForPluginsPtr(Debugger &, ConstString, ConstString, +GetDebuggerPropertyForPluginsPtr(Debugger &, ConstString, llvm::StringRef, bool can_create); } @@ -1514,7 +1515,7 @@ lldb::OptionValuePropertiesSP properties_sp; lldb::OptionValuePropertiesSP plugin_type_properties_sp(get_debugger_property( debugger, plugin_type_name, - ConstString(), // not creating to so we don't need the description + "", // not creating to so we don't need the description false)); if (plugin_type_properties_sp) properties_sp = @@ -1524,9 +1525,9 @@ static bool CreateSettingForPlugin(Debugger &debugger, ConstString plugin_type_name, - ConstString plugin_type_desc, + llvm::StringRef plugin_type_desc, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property, + llvm::StringRef description, bool is_global_property, GetDebuggerPropertyForPluginsPtr get_debugger_property = GetDebuggerPropertyForPlugins) { if (properties_sp) { @@ -1561,11 +1562,10 @@ bool PluginManager::CreateSettingForDynamicLoaderPlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property) { - return CreateSettingForPlugin( - debugger, ConstString(kDynamicLoaderPluginName), - ConstString("Settings for dynamic loader plug-ins"), properties_sp, - description, is_global_property); + llvm::StringRef description, bool is_global_property) { + return CreateSettingForPlugin(debugger, ConstString(kDynamicLoaderPluginName), + "Settings for dynamic loader plug-ins", + properties_sp, description, is_global_property); } lldb::OptionValuePropertiesSP @@ -1578,10 +1578,10 @@ bool PluginManager::CreateSettingForPlatformPlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property) { + llvm::StringRef description, bool is_global_property) { return CreateSettingForPlugin(debugger, ConstString(kPlatformPluginName), - ConstString("Settings for platform plug-ins"), - properties_sp, description, is_global_property, + "Settings for platform plug-ins", properties_sp, + description, is_global_property, GetDebuggerPropertyForPluginsOldStyle); } @@ -1594,18 +1594,18 @@ bool PluginManager::CreateSettingForProcessPlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property) { + llvm::StringRef description, bool is_global_property) { return CreateSettingForPlugin(debugger, ConstString(kProcessPluginName), - ConstString("Settings for process plug-ins"), - properties_sp, description, is_global_property); + "Settings for process plug-ins", properties_sp, + description, is_global_property); } bool PluginManager::CreateSettingForTracePlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property) { + llvm::StringRef description, bool is_global_property) { return CreateSettingForPlugin(debugger, ConstString(kTracePluginName), - ConstString("Settings for trace plug-ins"), - properties_sp, description, is_global_property); + "Settings for trace plug-ins", properties_sp, + description, is_global_property); } lldb::OptionValuePropertiesSP @@ -1617,11 +1617,10 @@ bool PluginManager::CreateSettingForObjectFilePlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property) { - return CreateSettingForPlugin( - debugger, ConstString(kObjectFilePluginName), - ConstString("Settings for object file plug-ins"), properties_sp, - description, is_global_property); + llvm::StringRef description, bool is_global_property) { + return CreateSettingForPlugin(debugger, ConstString(kObjectFilePluginName), + "Settings for object file plug-ins", + properties_sp, description, is_global_property); } lldb::OptionValuePropertiesSP @@ -1633,11 +1632,10 @@ bool PluginManager::CreateSettingForSymbolFilePlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property) { - return CreateSettingForPlugin( - debugger, ConstString(kSymbolFilePluginName), - ConstString("Settings for symbol file plug-ins"), properties_sp, - description, is_global_property); + llvm::StringRef description, bool is_global_property) { + return CreateSettingForPlugin(debugger, ConstString(kSymbolFilePluginName), + "Settings for symbol file plug-ins", + properties_sp, description, is_global_property); } lldb::OptionValuePropertiesSP @@ -1649,9 +1647,9 @@ bool PluginManager::CreateSettingForJITLoaderPlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property) { + llvm::StringRef description, bool is_global_property) { return CreateSettingForPlugin(debugger, ConstString(kJITLoaderPluginName), - ConstString("Settings for JIT loader plug-ins"), + "Settings for JIT loader plug-ins", properties_sp, description, is_global_property); } @@ -1664,7 +1662,7 @@ lldb::OptionValuePropertiesSP plugin_type_properties_sp( GetDebuggerPropertyForPlugins( debugger, ConstString(kOperatingSystemPluginName), - ConstString(), // not creating to so we don't need the description + "", // not creating to so we don't need the description false)); if (plugin_type_properties_sp) properties_sp = @@ -1674,12 +1672,12 @@ bool PluginManager::CreateSettingForOperatingSystemPlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property) { + llvm::StringRef description, bool is_global_property) { if (properties_sp) { lldb::OptionValuePropertiesSP plugin_type_properties_sp( GetDebuggerPropertyForPlugins( debugger, ConstString(kOperatingSystemPluginName), - ConstString("Settings for operating system plug-ins"), true)); + "Settings for operating system plug-ins", true)); if (plugin_type_properties_sp) { plugin_type_properties_sp->AppendProperty(properties_sp->GetName(), description, is_global_property, @@ -1699,9 +1697,9 @@ bool PluginManager::CreateSettingForStructuredDataPlugin( Debugger &debugger, const lldb::OptionValuePropertiesSP &properties_sp, - ConstString description, bool is_global_property) { - return CreateSettingForPlugin( - debugger, ConstString(kStructuredDataPluginName), - ConstString("Settings for structured data plug-ins"), properties_sp, - description, is_global_property); + llvm::StringRef description, bool is_global_property) { + return CreateSettingForPlugin(debugger, + ConstString(kStructuredDataPluginName), + "Settings for structured data plug-ins", + properties_sp, description, is_global_property); } diff --git a/lldb/source/Interpreter/OptionValueProperties.cpp b/lldb/source/Interpreter/OptionValueProperties.cpp --- a/lldb/source/Interpreter/OptionValueProperties.cpp +++ b/lldb/source/Interpreter/OptionValueProperties.cpp @@ -45,11 +45,9 @@ } void OptionValueProperties::AppendProperty(ConstString name, - ConstString desc, - bool is_global, + llvm::StringRef desc, bool is_global, const OptionValueSP &value_sp) { - Property property(name.GetStringRef(), desc.GetStringRef(), is_global, - value_sp); + Property property(name.GetStringRef(), desc, is_global, value_sp); m_name_to_index.Append(name, m_properties.size()); m_properties.push_back(property); value_sp->SetParent(shared_from_this()); diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp --- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp +++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp @@ -1608,7 +1608,7 @@ const bool is_global_setting = true; PluginManager::CreateSettingForDynamicLoaderPlugin( debugger, GetGlobalProperties().GetValueProperties(), - ConstString("Properties for the DynamicLoaderDarwinKernel plug-in."), + "Properties for the DynamicLoaderDarwinKernel plug-in.", is_global_setting); } } diff --git a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp --- a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp +++ b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp @@ -158,8 +158,7 @@ const bool is_global_setting = true; PluginManager::CreateSettingForJITLoaderPlugin( debugger, GetGlobalPluginProperties().GetValueProperties(), - ConstString("Properties for the JIT LoaderGDB plug-in."), - is_global_setting); + "Properties for the JIT LoaderGDB plug-in.", is_global_setting); } } diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp --- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp +++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp @@ -190,8 +190,7 @@ const bool is_global_setting = true; PluginManager::CreateSettingForObjectFilePlugin( debugger, GetGlobalPluginProperties().GetValueProperties(), - ConstString("Properties for the PE/COFF object-file plug-in."), - is_global_setting); + "Properties for the PE/COFF object-file plug-in.", is_global_setting); } } diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp @@ -164,8 +164,7 @@ const bool is_global_setting = false; PluginManager::CreateSettingForPlatformPlugin( debugger, GetGlobalProperties().GetValueProperties(), - ConstString("Properties for the Darwin platform plug-in."), - is_global_setting); + "Properties for the Darwin platform plug-in.", is_global_setting); OptionValueString *value = GetGlobalProperties().GetIgnoredExceptionValue(); value->SetValidator(ExceptionMaskValidator); } diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp @@ -221,8 +221,7 @@ const bool is_global_setting = true; PluginManager::CreateSettingForPlatformPlugin( debugger, GetGlobalProperties().GetValueProperties(), - ConstString("Properties for the PlatformDarwinKernel plug-in."), - is_global_setting); + "Properties for the PlatformDarwinKernel plug-in.", is_global_setting); } } diff --git a/lldb/source/Plugins/Platform/QemuUser/PlatformQemuUser.cpp b/lldb/source/Plugins/Platform/QemuUser/PlatformQemuUser.cpp --- a/lldb/source/Plugins/Platform/QemuUser/PlatformQemuUser.cpp +++ b/lldb/source/Plugins/Platform/QemuUser/PlatformQemuUser.cpp @@ -98,7 +98,7 @@ debugger, ConstString(GetPluginNameStatic()))) { PluginManager::CreateSettingForPlatformPlugin( debugger, GetGlobalProperties().GetValueProperties(), - ConstString("Properties for the qemu-user platform plugin."), + "Properties for the qemu-user platform plugin.", /*is_global_property=*/true); } } diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -713,8 +713,7 @@ const bool is_global_setting = true; PluginManager::CreateSettingForProcessPlugin( debugger, GetGlobalPluginProperties().GetValueProperties(), - ConstString("Properties for the kdp-remote process plug-in."), - is_global_setting); + "Properties for the kdp-remote process plug-in.", is_global_setting); } } 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 @@ -3400,8 +3400,7 @@ const bool is_global_setting = true; PluginManager::CreateSettingForProcessPlugin( debugger, GetGlobalPluginProperties().GetValueProperties(), - ConstString("Properties for the gdb-remote process plug-in."), - is_global_setting); + "Properties for the gdb-remote process plug-in.", is_global_setting); } } 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 @@ -1365,9 +1365,7 @@ const bool is_global_setting = true; PluginManager::CreateSettingForStructuredDataPlugin( debugger, GetGlobalProperties().GetValueProperties(), - ConstString("Properties for the darwin-log" - " plug-in."), - is_global_setting); + "Properties for the darwin-log plug-in.", is_global_setting); } } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -251,8 +251,7 @@ const bool is_global_setting = true; PluginManager::CreateSettingForSymbolFilePlugin( debugger, GetGlobalPluginProperties().GetValueProperties(), - ConstString("Properties for the dwarf symbol-file plug-in."), - is_global_setting); + "Properties for the dwarf symbol-file plug-in.", is_global_setting); } } diff --git a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp --- a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp +++ b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp @@ -88,8 +88,7 @@ const bool is_global_setting = true; PluginManager::CreateSettingForTracePlugin( debugger, GetGlobalProperties().GetValueProperties(), - ConstString("Properties for the intel-pt trace plug-in."), - is_global_setting); + "Properties for the intel-pt trace plug-in.", is_global_setting); } } 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 @@ -167,8 +167,8 @@ std::make_shared(ConstString("process")); m_collection_sp->Initialize(g_process_properties); m_collection_sp->AppendProperty( - ConstString("thread"), ConstString("Settings specific to threads."), - true, Thread::GetGlobalProperties().GetValueProperties()); + ConstString("thread"), "Settings specific to threads.", true, + Thread::GetGlobalProperties().GetValueProperties()); } else { m_collection_sp = OptionValueProperties::CreateLocalCopy(Process::GetGlobalProperties()); @@ -181,8 +181,8 @@ std::make_unique(); m_collection_sp->AppendProperty( ConstString(Properties::GetExperimentalSettingsName()), - ConstString("Experimental settings - setting these won't produce " - "errors if the setting is not present."), + "Experimental settings - setting these won't produce " + "errors if the setting is not present.", true, m_experimental_properties_up->GetValueProperties()); } diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -4088,8 +4088,8 @@ std::make_unique(); m_collection_sp->AppendProperty( ConstString(Properties::GetExperimentalSettingsName()), - ConstString("Experimental settings - setting these won't produce " - "errors if the setting is not present."), + "Experimental settings - setting these won't produce " + "errors if the setting is not present.", true, m_experimental_properties_up->GetValueProperties()); } else { m_collection_sp = @@ -4099,12 +4099,12 @@ std::make_unique(); m_collection_sp->AppendProperty( ConstString(Properties::GetExperimentalSettingsName()), - ConstString("Experimental settings - setting these won't produce " - "errors if the setting is not present."), + "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"), ConstString("Settings specific to processes."), - true, Process::GetGlobalProperties().GetValueProperties()); + ConstString("process"), "Settings specific to processes.", true, + Process::GetGlobalProperties().GetValueProperties()); m_collection_sp->SetValueChangedCallback( ePropertySaveObjectsDir, [this] { CheckJITObjectsDir(); }); } diff --git a/lldb/unittests/Interpreter/TestOptionValue.cpp b/lldb/unittests/Interpreter/TestOptionValue.cpp --- a/lldb/unittests/Interpreter/TestOptionValue.cpp +++ b/lldb/unittests/Interpreter/TestOptionValue.cpp @@ -84,11 +84,10 @@ const bool is_global = false; auto dict_sp = std::make_shared(1 << eTypeUInt64); - props_sp->AppendProperty(ConstString("dict"), ConstString(), is_global, - dict_sp); + props_sp->AppendProperty(ConstString("dict"), "", is_global, dict_sp); auto file_list_sp = std::make_shared(); - props_sp->AppendProperty(ConstString("file-list"), ConstString(), is_global, + props_sp->AppendProperty(ConstString("file-list"), "", is_global, file_list_sp); return props_sp; }