Author: Alex Langford Date: 2023-08-31T11:27:59-07:00 New Revision: 14d95b26aee0ac0ac8a70252e8a3c7a986e0e812
URL: https://github.com/llvm/llvm-project/commit/14d95b26aee0ac0ac8a70252e8a3c7a986e0e812 DIFF: https://github.com/llvm/llvm-project/commit/14d95b26aee0ac0ac8a70252e8a3c7a986e0e812.diff LOG: [lldb][NFCI] Remove unneeded ConstString conversions ConstString can be implicitly converted into a llvm::StringRef. This is very useful in many places, but it also hides places where we are creating a ConstString only to use it as a StringRef for the entire lifespan of the ConstString object. I locally removed the implicit conversion and found some of the places we were doing this. Differential Revision: https://reviews.llvm.org/D159237 Added: Modified: lldb/include/lldb/Target/Platform.h lldb/source/Core/ModuleList.cpp lldb/source/Core/ValueObjectSyntheticFilter.cpp lldb/source/Interpreter/CommandInterpreter.cpp lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp lldb/source/Plugins/Platform/QemuUser/PlatformQemuUser.cpp lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp lldb/source/Target/Platform.cpp lldb/source/Target/Process.cpp lldb/source/Target/Target.cpp lldb/source/Target/Thread.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/Target/Platform.h b/lldb/include/lldb/Target/Platform.h index 583e9a2e5a4c92..08a58c80ef8477 100644 --- a/lldb/include/lldb/Target/Platform.h +++ b/lldb/include/lldb/Target/Platform.h @@ -44,7 +44,7 @@ class PlatformProperties : public Properties { public: PlatformProperties(); - static ConstString GetSettingName(); + static llvm::StringRef GetSettingName(); bool GetUseModuleCache() const; bool SetUseModuleCache(bool use_module_cache); diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp index 17d4560f724b84..9842f56b1fe4b5 100644 --- a/lldb/source/Core/ModuleList.cpp +++ b/lldb/source/Core/ModuleList.cpp @@ -75,8 +75,7 @@ enum { } // namespace ModuleListProperties::ModuleListProperties() { - m_collection_sp = - std::make_shared<OptionValueProperties>(ConstString("symbols")); + m_collection_sp = std::make_shared<OptionValueProperties>("symbols"); m_collection_sp->Initialize(g_modulelist_properties); m_collection_sp->SetValueChangedCallback(ePropertySymLinkPaths, [this] { UpdateSymlinkMappings(); }); diff --git a/lldb/source/Core/ValueObjectSyntheticFilter.cpp b/lldb/source/Core/ValueObjectSyntheticFilter.cpp index b91acbc053593d..59ed780b654f3a 100644 --- a/lldb/source/Core/ValueObjectSyntheticFilter.cpp +++ b/lldb/source/Core/ValueObjectSyntheticFilter.cpp @@ -311,7 +311,7 @@ ValueObjectSynthetic::GetChildMemberWithName(llvm::StringRef name, bool can_create) { UpdateValueIfNeeded(); - uint32_t index = GetIndexOfChildWithName(ConstString(name)); + uint32_t index = GetIndexOfChildWithName(name); if (index == UINT32_MAX) return lldb::ValueObjectSP(); diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index 1a8b691090ba2d..6d1ad799f2d10f 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -128,8 +128,8 @@ CommandInterpreter::CommandInterpreter(Debugger &debugger, bool synchronous_execution) : Broadcaster(debugger.GetBroadcasterManager(), CommandInterpreter::GetStaticBroadcasterClass().AsCString()), - Properties(OptionValuePropertiesSP( - new OptionValueProperties(ConstString("interpreter")))), + Properties( + OptionValuePropertiesSP(new OptionValueProperties("interpreter"))), IOHandlerDelegate(IOHandlerDelegate::Completion::LLDBCommand), m_debugger(debugger), m_synchronous_execution(true), m_skip_lldbinit_files(false), m_skip_app_init_files(false), diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp index a4d56ef9f967a8..378b2472278605 100644 --- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp +++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp @@ -98,8 +98,8 @@ enum { class DynamicLoaderDarwinKernelProperties : public Properties { public: - static ConstString &GetSettingName() { - static ConstString g_setting_name("darwin-kernel"); + static llvm::StringRef GetSettingName() { + static constexpr llvm::StringLiteral g_setting_name("darwin-kernel"); return g_setting_name; } diff --git a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp index b78f45cf1efdfa..5326a73166e72e 100644 --- a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp +++ b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp @@ -89,8 +89,8 @@ enum { class PluginProperties : public Properties { public: - static ConstString GetSettingName() { - return ConstString(JITLoaderGDB::GetPluginNameStatic()); + static llvm::StringRef GetSettingName() { + return JITLoaderGDB::GetPluginNameStatic(); } PluginProperties() { diff --git a/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp b/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp index cd3ac92ae4a8b7..2876efc5c41a55 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp @@ -38,7 +38,7 @@ class GenericBitsetFrontEnd : public SyntheticChildrenFrontEnd { ValueObjectSP GetChildAtIndex(size_t idx) override; private: - ConstString GetDataContainerMemberName(); + llvm::StringRef GetDataContainerMemberName(); // The lifetime of a ValueObject and all its derivative ValueObjects // (children, clones, etc.) is managed by a ClusterManager. These @@ -66,12 +66,14 @@ GenericBitsetFrontEnd::GenericBitsetFrontEnd(ValueObject &valobj, StdLib stdlib) } } -ConstString GenericBitsetFrontEnd::GetDataContainerMemberName() { +llvm::StringRef GenericBitsetFrontEnd::GetDataContainerMemberName() { + static constexpr llvm::StringLiteral s_libcxx_case("__first_"); + static constexpr llvm::StringLiteral s_libstdcpp_case("_M_w"); switch (m_stdlib) { case StdLib::LibCxx: - return ConstString("__first_"); + return s_libcxx_case; case StdLib::LibStdcpp: - return ConstString("_M_w"); + return s_libstdcpp_case; } llvm_unreachable("Unknown StdLib enum"); } diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp index a8d97989ac85d6..e89906a02e1b96 100644 --- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp +++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp @@ -79,8 +79,8 @@ enum { class PluginProperties : public Properties { public: - static ConstString GetSettingName() { - return ConstString(ObjectFilePECOFF::GetPluginNameStatic()); + static llvm::StringRef GetSettingName() { + return ObjectFilePECOFF::GetPluginNameStatic(); } PluginProperties() { diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp index a1d2924203f137..e177c134fea20e 100644 --- a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp +++ b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp @@ -43,7 +43,7 @@ class PluginProperties : public Properties { public: PluginProperties() { m_collection_sp = std::make_shared<OptionValueProperties>( - ConstString(PlatformAndroid::GetPluginNameStatic(false))); + PlatformAndroid::GetPluginNameStatic(false)); m_collection_sp->Initialize(g_android_properties); } }; @@ -155,8 +155,8 @@ PlatformSP PlatformAndroid::CreateInstance(bool force, const ArchSpec *arch) { } void PlatformAndroid::DebuggerInitialize(Debugger &debugger) { - if (!PluginManager::GetSettingForPlatformPlugin( - debugger, ConstString(GetPluginNameStatic(false)))) { + if (!PluginManager::GetSettingForPlatformPlugin(debugger, + GetPluginNameStatic(false))) { PluginManager::CreateSettingForPlatformPlugin( debugger, GetGlobalProperties().GetValueProperties(), "Properties for the Android platform plugin.", diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp index fb652d9f02e0ed..ed617fe79fb476 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp @@ -123,8 +123,8 @@ enum { class PlatformDarwinProperties : public Properties { public: - static ConstString &GetSettingName() { - static ConstString g_setting_name("darwin"); + static llvm::StringRef GetSettingName() { + static constexpr llvm::StringLiteral g_setting_name("darwin"); return g_setting_name; } diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp index 4527e3568d3627..4d485e75adcd80 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp @@ -187,8 +187,8 @@ enum { class PlatformDarwinKernelProperties : public Properties { public: - static ConstString &GetSettingName() { - static ConstString g_setting_name("darwin-kernel"); + static llvm::StringRef GetSettingName() { + static constexpr llvm::StringLiteral g_setting_name("darwin-kernel"); return g_setting_name; } diff --git a/lldb/source/Plugins/Platform/QemuUser/PlatformQemuUser.cpp b/lldb/source/Plugins/Platform/QemuUser/PlatformQemuUser.cpp index b233b1ba9b5899..460f5560573d90 100644 --- a/lldb/source/Plugins/Platform/QemuUser/PlatformQemuUser.cpp +++ b/lldb/source/Plugins/Platform/QemuUser/PlatformQemuUser.cpp @@ -36,7 +36,7 @@ class PluginProperties : public Properties { public: PluginProperties() { m_collection_sp = std::make_shared<OptionValueProperties>( - ConstString(PlatformQemuUser::GetPluginNameStatic())); + PlatformQemuUser::GetPluginNameStatic()); m_collection_sp->Initialize(g_platformqemuuser_properties); } @@ -89,8 +89,8 @@ void PlatformQemuUser::Terminate() { } void PlatformQemuUser::DebuggerInitialize(Debugger &debugger) { - if (!PluginManager::GetSettingForPlatformPlugin( - debugger, ConstString(GetPluginNameStatic()))) { + if (!PluginManager::GetSettingForPlatformPlugin(debugger, + GetPluginNameStatic())) { PluginManager::CreateSettingForPlatformPlugin( debugger, GetGlobalProperties().GetValueProperties(), "Properties for the qemu-user platform plugin.", diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp index b17701ea4a15cf..79f8b15a7f229c 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -65,8 +65,8 @@ enum { class PluginProperties : public Properties { public: - static ConstString GetSettingName() { - return ConstString(ProcessKDP::GetPluginNameStatic()); + static llvm::StringRef GetSettingName() { + return ProcessKDP::GetPluginNameStatic(); } PluginProperties() : Properties() { diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 5391187a75a7a2..a4babce41e2b46 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -129,8 +129,8 @@ enum { class PluginProperties : public Properties { public: - static ConstString GetSettingName() { - return ConstString(ProcessGDBRemote::GetPluginNameStatic()); + static llvm::StringRef GetSettingName() { + return ProcessGDBRemote::GetPluginNameStatic(); } PluginProperties() : Properties() { diff --git a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp index a5818915773c4a..2ea556ad954a94 100644 --- a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp +++ b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp @@ -117,8 +117,8 @@ enum { class StructuredDataDarwinLogProperties : public Properties { public: - static ConstString &GetSettingName() { - static ConstString g_setting_name("darwin-log"); + static llvm::StringRef GetSettingName() { + static constexpr llvm::StringLiteral g_setting_name("darwin-log"); return g_setting_name; } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp index 02037e7403cd9a..0ef4b6e72fa076 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -114,8 +114,8 @@ enum { class PluginProperties : public Properties { public: - static ConstString GetSettingName() { - return ConstString(SymbolFileDWARF::GetPluginNameStatic()); + static llvm::StringRef GetSettingName() { + return SymbolFileDWARF::GetPluginNameStatic(); } PluginProperties() { diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp index 5ee261ed5ecf50..c117339f07cc9d 100644 --- a/lldb/source/Target/Platform.cpp +++ b/lldb/source/Target/Platform.cpp @@ -72,8 +72,8 @@ enum { } // namespace -ConstString PlatformProperties::GetSettingName() { - static ConstString g_setting_name("platform"); +llvm::StringRef PlatformProperties::GetSettingName() { + static constexpr llvm::StringLiteral g_setting_name("platform"); return g_setting_name; } diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index 85ca0f6ab8d153..9555ff71785947 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -89,7 +89,7 @@ using namespace std::chrono; class ProcessOptionValueProperties : public Cloneable<ProcessOptionValueProperties, OptionValueProperties> { public: - ProcessOptionValueProperties(ConstString name) : Cloneable(name) {} + ProcessOptionValueProperties(llvm::StringRef name) : Cloneable(name) {} const Property * GetPropertyAtIndex(size_t idx, @@ -146,8 +146,7 @@ class ProcessExperimentalOptionValueProperties OptionValueProperties> { public: ProcessExperimentalOptionValueProperties() - : Cloneable( - ConstString(Properties::GetExperimentalSettingsName())) {} + : Cloneable(Properties::GetExperimentalSettingsName()) {} }; ProcessExperimentalProperties::ProcessExperimentalProperties() @@ -162,8 +161,7 @@ ProcessProperties::ProcessProperties(lldb_private::Process *process) { if (process == nullptr) { // Global process properties, set them up one time - m_collection_sp = - std::make_shared<ProcessOptionValueProperties>(ConstString("process")); + m_collection_sp = std::make_shared<ProcessOptionValueProperties>("process"); m_collection_sp->Initialize(g_process_properties); m_collection_sp->AppendProperty( "thread", "Settings specific to threads.", true, diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index f5b551f581f9fd..622ed082f09030 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -4062,7 +4062,7 @@ enum { class TargetOptionValueProperties : public Cloneable<TargetOptionValueProperties, OptionValueProperties> { public: - TargetOptionValueProperties(ConstString name) : Cloneable(name) {} + TargetOptionValueProperties(llvm::StringRef name) : Cloneable(name) {} const Property * GetPropertyAtIndex(size_t idx, @@ -4098,7 +4098,7 @@ class TargetExperimentalOptionValueProperties OptionValueProperties> { public: TargetExperimentalOptionValueProperties() - : Cloneable(ConstString(Properties::GetExperimentalSettingsName())) {} + : Cloneable(Properties::GetExperimentalSettingsName()) {} }; TargetExperimentalProperties::TargetExperimentalProperties() @@ -4152,8 +4152,7 @@ TargetProperties::TargetProperties(Target *target) "errors if the setting is not present.", true, m_experimental_properties_up->GetValueProperties()); } else { - m_collection_sp = - std::make_shared<TargetOptionValueProperties>(ConstString("target")); + m_collection_sp = std::make_shared<TargetOptionValueProperties>("target"); m_collection_sp->Initialize(g_target_properties); m_experimental_properties_up = std::make_unique<TargetExperimentalProperties>(); diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp index ec4ffcbd920508..b6c19a2e0b3626 100644 --- a/lldb/source/Target/Thread.cpp +++ b/lldb/source/Target/Thread.cpp @@ -76,7 +76,7 @@ enum { class ThreadOptionValueProperties : public Cloneable<ThreadOptionValueProperties, OptionValueProperties> { public: - ThreadOptionValueProperties(ConstString name) : Cloneable(name) {} + ThreadOptionValueProperties(llvm::StringRef name) : Cloneable(name) {} const Property * GetPropertyAtIndex(size_t idx, @@ -100,8 +100,7 @@ class ThreadOptionValueProperties ThreadProperties::ThreadProperties(bool is_global) : Properties() { if (is_global) { - m_collection_sp = - std::make_shared<ThreadOptionValueProperties>(ConstString("thread")); + m_collection_sp = std::make_shared<ThreadOptionValueProperties>("thread"); m_collection_sp->Initialize(g_thread_properties); } else m_collection_sp = _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
