From 49481b538065a0ba5ba1d7cc901eeceb8bf344c0 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Thu, 21 Oct 2021 20:13:45 +0200 Subject: [PATCH] Remove ConstString from Language, LanguageRuntime, SystemRuntime and SymbolFile plugin names --- lldb/include/lldb/Core/PluginManager.h | 8 +++---- lldb/source/Core/PluginManager.cpp | 27 ++++++++++++---------- .../Language/CPlusPlus/CPlusPlusLanguage.cpp | 5 ---- .../Plugins/Language/CPlusPlus/CPlusPlusLanguage.h | 6 ++--- lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp | 5 ---- lldb/source/Plugins/Language/ObjC/ObjCLanguage.h | 6 ++--- .../Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp | 5 ---- .../Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h | 6 ++--- .../ItaniumABI/ItaniumABILanguageRuntime.cpp | 5 ---- .../ItaniumABI/ItaniumABILanguageRuntime.h | 6 ++--- .../ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp | 5 ---- .../ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h | 6 ++--- .../ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp | 5 ---- .../ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h | 6 ++--- .../RenderScriptRuntime/RenderScriptRuntime.cpp | 5 ---- .../RenderScriptRuntime/RenderScriptRuntime.h | 6 ++--- .../SymbolFile/Breakpad/SymbolFileBreakpad.cpp | 5 ---- .../SymbolFile/Breakpad/SymbolFileBreakpad.h | 8 +++---- .../Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp | 9 ++------ .../Plugins/SymbolFile/DWARF/SymbolFileDWARF.h | 8 +++---- .../SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp | 11 +++------ .../SymbolFile/DWARF/SymbolFileDWARFDebugMap.h | 8 +++---- .../SymbolFile/NativePDB/SymbolFileNativePDB.cpp | 7 +----- .../SymbolFile/NativePDB/SymbolFileNativePDB.h | 8 +++---- .../Plugins/SymbolFile/PDB/SymbolFilePDB.cpp | 7 +----- lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h | 8 +++---- .../Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp | 7 +----- .../Plugins/SymbolFile/Symtab/SymbolFileSymtab.h | 8 +++---- .../SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp | 14 +++-------- .../SystemRuntime/MacOSX/SystemRuntimeMacOSX.h | 10 ++++---- .../SymbolFile/DWARF/SymbolFileDWARFTests.cpp | 3 +-- .../SymbolFile/PDB/SymbolFilePDBTests.cpp | 3 +-- 32 files changed, 68 insertions(+), 168 deletions(-) diff --git a/lldb/include/lldb/Core/PluginManager.h b/lldb/include/lldb/Core/PluginManager.h index aa51069..e027968 100644 --- a/lldb/include/lldb/Core/PluginManager.h +++ b/lldb/include/lldb/Core/PluginManager.h @@ -134,7 +134,7 @@ public: GetOperatingSystemCreateCallbackForPluginName(llvm::StringRef name); // Language - static bool RegisterPlugin(ConstString name, const char *description, + static bool RegisterPlugin(llvm::StringRef name, llvm::StringRef description, LanguageCreateInstance create_callback); static bool UnregisterPlugin(LanguageCreateInstance create_callback); @@ -143,7 +143,7 @@ public: // LanguageRuntime static bool RegisterPlugin( - ConstString name, const char *description, + llvm::StringRef name, llvm::StringRef description, LanguageRuntimeCreateInstance create_callback, LanguageRuntimeGetCommandObject command_callback = nullptr, LanguageRuntimeGetExceptionPrecondition precondition_callback = nullptr); @@ -160,7 +160,7 @@ public: GetLanguageRuntimeGetExceptionPreconditionAtIndex(uint32_t idx); // SystemRuntime - static bool RegisterPlugin(ConstString name, const char *description, + static bool RegisterPlugin(llvm::StringRef name, llvm::StringRef description, SystemRuntimeCreateInstance create_callback); static bool UnregisterPlugin(SystemRuntimeCreateInstance create_callback); @@ -314,7 +314,7 @@ public: // SymbolFile static bool - RegisterPlugin(ConstString name, const char *description, + RegisterPlugin(llvm::StringRef name, llvm::StringRef description, SymbolFileCreateInstance create_callback, DebuggerInitializeCallback debugger_init_callback = nullptr); diff --git a/lldb/source/Core/PluginManager.cpp b/lldb/source/Core/PluginManager.cpp index fdf2aa7..db603c1 100644 --- a/lldb/source/Core/PluginManager.cpp +++ b/lldb/source/Core/PluginManager.cpp @@ -514,10 +514,11 @@ static LanguageInstances &GetLanguageInstances() { return g_instances; } -bool PluginManager::RegisterPlugin(ConstString name, const char *description, +bool PluginManager::RegisterPlugin(llvm::StringRef name, + llvm::StringRef description, LanguageCreateInstance create_callback) { - return GetLanguageInstances().RegisterPlugin(name, description, - create_callback); + return GetLanguageInstances().RegisterPlugin( + ConstString(name), description.str().c_str(), create_callback); } bool PluginManager::UnregisterPlugin(LanguageCreateInstance create_callback) { @@ -534,7 +535,8 @@ PluginManager::GetLanguageCreateCallbackAtIndex(uint32_t idx) { struct LanguageRuntimeInstance : public PluginInstance { LanguageRuntimeInstance( - ConstString name, std::string description, CallbackType create_callback, + ConstString name, std::string description, + CallbackType create_callback, DebuggerInitializeCallback debugger_init_callback, LanguageRuntimeGetCommandObject command_callback, LanguageRuntimeGetExceptionPrecondition precondition_callback) @@ -556,13 +558,13 @@ static LanguageRuntimeInstances &GetLanguageRuntimeInstances() { } bool PluginManager::RegisterPlugin( - ConstString name, const char *description, + llvm::StringRef name, llvm::StringRef description, LanguageRuntimeCreateInstance create_callback, LanguageRuntimeGetCommandObject command_callback, LanguageRuntimeGetExceptionPrecondition precondition_callback) { return GetLanguageRuntimeInstances().RegisterPlugin( - name, description, create_callback, nullptr, command_callback, - precondition_callback); + ConstString(name), description.str().c_str(), create_callback, nullptr, + command_callback, precondition_callback); } bool PluginManager::UnregisterPlugin( @@ -602,10 +604,10 @@ static SystemRuntimeInstances &GetSystemRuntimeInstances() { } bool PluginManager::RegisterPlugin( - ConstString name, const char *description, + llvm::StringRef name, llvm::StringRef description, SystemRuntimeCreateInstance create_callback) { - return GetSystemRuntimeInstances().RegisterPlugin(name, description, - create_callback); + return GetSystemRuntimeInstances().RegisterPlugin( + ConstString(name), description.str().c_str(), create_callback); } bool PluginManager::UnregisterPlugin( @@ -990,11 +992,12 @@ static SymbolFileInstances &GetSymbolFileInstances() { } bool PluginManager::RegisterPlugin( - ConstString name, const char *description, + llvm::StringRef name, llvm::StringRef description, SymbolFileCreateInstance create_callback, DebuggerInitializeCallback debugger_init_callback) { return GetSymbolFileInstances().RegisterPlugin( - name, description, create_callback, debugger_init_callback); + ConstString(name), description.str().c_str(), create_callback, + debugger_init_callback); } bool PluginManager::UnregisterPlugin(SymbolFileCreateInstance create_callback) { diff --git a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp index 240bbec..03e3e46 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp @@ -56,11 +56,6 @@ void CPlusPlusLanguage::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString CPlusPlusLanguage::GetPluginNameStatic() { - static ConstString g_name("cplusplus"); - return g_name; -} - bool CPlusPlusLanguage::SymbolNameFitsToLanguage(Mangled mangled) const { const char *mangled_name = mangled.GetMangledName().GetCString(); return mangled_name && CPlusPlusLanguage::IsCPPMangledName(mangled_name); diff --git a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h index eebb409..5547864 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h +++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h @@ -102,7 +102,7 @@ public: static lldb_private::Language *CreateInstance(lldb::LanguageType language); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "cplusplus"; } bool SymbolNameFitsToLanguage(Mangled mangled) const override; @@ -134,9 +134,7 @@ public: const Mangled mangled, const SymbolContext &sym_ctx) const override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } }; } // namespace lldb_private diff --git a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp index 7aeaf7a..99ce389 100644 --- a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp +++ b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp @@ -48,11 +48,6 @@ void ObjCLanguage::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString ObjCLanguage::GetPluginNameStatic() { - static ConstString g_name("objc"); - return g_name; -} - // Static Functions Language *ObjCLanguage::CreateInstance(lldb::LanguageType language) { diff --git a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.h b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.h index bc35cbe..9144520 100644 --- a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.h +++ b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.h @@ -133,7 +133,7 @@ public: static lldb_private::Language *CreateInstance(lldb::LanguageType language); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "objc"; } static bool IsPossibleObjCMethodName(const char *name) { if (!name) @@ -156,9 +156,7 @@ public: } // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } }; } // namespace lldb_private diff --git a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp index 2aa49ad..700dda3 100644 --- a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp +++ b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp @@ -34,11 +34,6 @@ void ObjCPlusPlusLanguage::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString ObjCPlusPlusLanguage::GetPluginNameStatic() { - static ConstString g_name("objcplusplus"); - return g_name; -} - // Static Functions Language *ObjCPlusPlusLanguage::CreateInstance(lldb::LanguageType language) { switch (language) { diff --git a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h index 9d09372..20184fd 100644 --- a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h +++ b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h @@ -40,12 +40,10 @@ public: static lldb_private::Language *CreateInstance(lldb::LanguageType language); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "objcplusplus"; } // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } }; } // namespace lldb_private diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp index d6048fb..92f732f 100644 --- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp @@ -405,11 +405,6 @@ void ItaniumABILanguageRuntime::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString ItaniumABILanguageRuntime::GetPluginNameStatic() { - static ConstString g_name("itanium"); - return g_name; -} - BreakpointResolverSP ItaniumABILanguageRuntime::CreateExceptionResolver( const BreakpointSP &bkpt, bool catch_bp, bool throw_bp) { return CreateExceptionResolver(bkpt, catch_bp, throw_bp, false); diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h index 7b37cf8..ca8d5ab 100644 --- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h +++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h @@ -35,7 +35,7 @@ public: static lldb_private::LanguageRuntime * CreateInstance(Process *process, lldb::LanguageType language); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "itanium"; } static char ID; @@ -76,9 +76,7 @@ public: lldb::ThreadSP thread_sp) override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: lldb::BreakpointResolverSP diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp index 1fb872f..609e8e9 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp @@ -92,11 +92,6 @@ void AppleObjCRuntimeV1::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString AppleObjCRuntimeV1::GetPluginNameStatic() { - static ConstString g_name("apple-objc-v1"); - return g_name; -} - BreakpointResolverSP AppleObjCRuntimeV1::CreateExceptionResolver(const BreakpointSP &bkpt, bool catch_bp, bool throw_bp) { diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h index 26449b5..46d8e89 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h @@ -28,7 +28,7 @@ public: static lldb_private::LanguageRuntime * CreateInstance(Process *process, lldb::LanguageType language); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "apple-objc-v1"; } static char ID; @@ -107,9 +107,7 @@ public: CreateObjectChecker(std::string, ExecutionContext &exe_ctx) override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } ObjCRuntimeVersions GetRuntimeVersion() const override { return ObjCRuntimeVersions::eAppleObjC_V1; diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp index 091bd37..240b458 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp @@ -1061,11 +1061,6 @@ void AppleObjCRuntimeV2::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString AppleObjCRuntimeV2::GetPluginNameStatic() { - static ConstString g_name("apple-objc-v2"); - return g_name; -} - BreakpointResolverSP AppleObjCRuntimeV2::CreateExceptionResolver(const BreakpointSP &bkpt, bool catch_bp, bool throw_bp) { diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h index 8ea4cf9..6266634 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h @@ -33,7 +33,7 @@ public: static lldb_private::LanguageRuntime * CreateInstance(Process *process, lldb::LanguageType language); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "apple-objc-v2"; } static char ID; @@ -54,9 +54,7 @@ public: llvm::Expected> CreateObjectChecker(std::string name, ExecutionContext &exe_ctx) override; - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } ObjCRuntimeVersions GetRuntimeVersion() const override { return ObjCRuntimeVersions::eAppleObjC_V2; diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp index 517d160..d6de658 100644 --- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp @@ -966,11 +966,6 @@ void RenderScriptRuntime::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString RenderScriptRuntime::GetPluginNameStatic() { - static ConstString plugin_name("renderscript"); - return plugin_name; -} - RenderScriptRuntime::ModuleKind RenderScriptRuntime::GetModuleKind(const lldb::ModuleSP &module_sp) { if (module_sp) { diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h index 66553fd..4ddf996 100644 --- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h +++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h @@ -318,7 +318,7 @@ public: static lldb::CommandObjectSP GetCommandObject(CommandInterpreter &interpreter); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "renderscript"; } static char ID; @@ -410,9 +410,7 @@ public: bool GetOverrideExprOptions(clang::TargetOptions &prototype); // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } static bool GetKernelCoordinate(lldb_renderscript::RSCoordinate &coord, Thread *thread_ptr); diff --git a/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.cpp b/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.cpp index 243af5e..ef11ed2 100644 --- a/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.cpp +++ b/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.cpp @@ -176,11 +176,6 @@ void SymbolFileBreakpad::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -ConstString SymbolFileBreakpad::GetPluginNameStatic() { - static ConstString g_name("breakpad"); - return g_name; -} - uint32_t SymbolFileBreakpad::CalculateAbilities() { if (!m_objfile_sp || !llvm::isa(*m_objfile_sp)) return 0; diff --git a/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h b/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h index 36ce536..2f7b822 100644 --- a/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h +++ b/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h @@ -37,9 +37,9 @@ public: static void Initialize(); static void Terminate(); static void DebuggerInitialize(Debugger &debugger) {} - static ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "breakpad"; } - static const char *GetPluginDescriptionStatic() { + static llvm::StringRef GetPluginDescriptionStatic() { return "Breakpad debug symbol file reader."; } @@ -146,9 +146,7 @@ public: GetUnwindPlan(const Address &address, const RegisterInfoResolver &resolver) override; - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } uint64_t GetDebugInfoSize() override; diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp index 21f52f0..205b034 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -131,7 +131,7 @@ enum { class PluginProperties : public Properties { public: static ConstString GetSettingName() { - return SymbolFileDWARF::GetPluginNameStatic(); + return ConstString(SymbolFileDWARF::GetPluginNameStatic()); } PluginProperties() { @@ -277,12 +277,7 @@ void SymbolFileDWARF::Terminate() { LogChannelDWARF::Terminate(); } -lldb_private::ConstString SymbolFileDWARF::GetPluginNameStatic() { - static ConstString g_name("dwarf"); - return g_name; -} - -const char *SymbolFileDWARF::GetPluginDescriptionStatic() { +llvm::StringRef SymbolFileDWARF::GetPluginDescriptionStatic() { return "DWARF and DWARF3 debug symbol file reader."; } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h index 4d6fccd..271ce7b 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h @@ -84,9 +84,9 @@ public: static void DebuggerInitialize(lldb_private::Debugger &debugger); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "dwarf"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::SymbolFile * CreateInstance(lldb::ObjectFileSP objfile_sp); @@ -219,9 +219,7 @@ public: std::recursive_mutex &GetModuleMutex() const override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } DWARFDebugAbbrev *DebugAbbrev(); diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp index a58696b..2491f6a 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp @@ -228,12 +228,7 @@ void SymbolFileDWARFDebugMap::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString SymbolFileDWARFDebugMap::GetPluginNameStatic() { - static ConstString g_name("dwarf-debugmap"); - return g_name; -} - -const char *SymbolFileDWARFDebugMap::GetPluginDescriptionStatic() { +llvm::StringRef SymbolFileDWARFDebugMap::GetPluginDescriptionStatic() { return "DWARF and DWARF3 debug symbol file reader (debug map)."; } @@ -528,8 +523,8 @@ SymbolFileDWARFDebugMap::GetSymbolFileByOSOIndex(uint32_t oso_idx) { SymbolFileDWARF * SymbolFileDWARFDebugMap::GetSymbolFileAsSymbolFileDWARF(SymbolFile *sym_file) { - if (sym_file && sym_file->GetPluginName() == - SymbolFileDWARF::GetPluginNameStatic().GetStringRef()) + if (sym_file && + sym_file->GetPluginName() == SymbolFileDWARF::GetPluginNameStatic()) return static_cast(sym_file); return nullptr; } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h index 89da4e8..74f3244 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h @@ -40,9 +40,9 @@ public: static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "dwarf-debugmap"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::SymbolFile * CreateInstance(lldb::ObjectFileSP objfile_sp); @@ -140,9 +140,7 @@ public: void DumpClangAST(lldb_private::Stream &s) override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } uint64_t GetDebugInfoSize() override; lldb_private::StatsDuration GetDebugInfoParseTime() override; diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp index 152d8f7..7a734c9 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp +++ b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp @@ -240,12 +240,7 @@ void SymbolFileNativePDB::Terminate() { void SymbolFileNativePDB::DebuggerInitialize(Debugger &debugger) {} -ConstString SymbolFileNativePDB::GetPluginNameStatic() { - static ConstString g_name("native-pdb"); - return g_name; -} - -const char *SymbolFileNativePDB::GetPluginDescriptionStatic() { +llvm::StringRef SymbolFileNativePDB::GetPluginDescriptionStatic() { return "Microsoft PDB debug symbol cross-platform file reader."; } diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h index c19875e..56a5ec0 100644 --- a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h +++ b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h @@ -60,9 +60,9 @@ public: static void DebuggerInitialize(Debugger &debugger); - static ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "native-pdb"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static SymbolFile *CreateInstance(lldb::ObjectFileSP objfile_sp); @@ -153,9 +153,7 @@ public: FindNamespace(ConstString name, const CompilerDeclContext &parent_decl_ctx) override; - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } llvm::pdb::PDBFile &GetPDBFile() { return m_index->pdb(); } const llvm::pdb::PDBFile &GetPDBFile() const { return m_index->pdb(); } diff --git a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp index f6e3428..45dfc4b 100644 --- a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp +++ b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp @@ -119,12 +119,7 @@ void SymbolFilePDB::Terminate() { void SymbolFilePDB::DebuggerInitialize(lldb_private::Debugger &debugger) {} -lldb_private::ConstString SymbolFilePDB::GetPluginNameStatic() { - static ConstString g_name("pdb"); - return g_name; -} - -const char *SymbolFilePDB::GetPluginDescriptionStatic() { +llvm::StringRef SymbolFilePDB::GetPluginDescriptionStatic() { return "Microsoft PDB debug symbol file reader."; } diff --git a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h index 67e309f..69f1d26 100644 --- a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h +++ b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h @@ -41,9 +41,9 @@ public: static void DebuggerInitialize(lldb_private::Debugger &debugger); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "pdb"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::SymbolFile * CreateInstance(lldb::ObjectFileSP objfile_sp); @@ -161,9 +161,7 @@ public: lldb_private::ConstString name, const lldb_private::CompilerDeclContext &parent_decl_ctx) override; - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } llvm::pdb::IPDBSession &GetPDBSession(); diff --git a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp index e3358b2..d95cfea 100644 --- a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp +++ b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp @@ -38,12 +38,7 @@ void SymbolFileSymtab::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString SymbolFileSymtab::GetPluginNameStatic() { - static ConstString g_name("symtab"); - return g_name; -} - -const char *SymbolFileSymtab::GetPluginDescriptionStatic() { +llvm::StringRef SymbolFileSymtab::GetPluginDescriptionStatic() { return "Reads debug symbols from an object file's symbol table."; } diff --git a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h index 11475b0..2dad12b 100644 --- a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h +++ b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h @@ -36,9 +36,9 @@ public: static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "symtab"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::SymbolFile * CreateInstance(lldb::ObjectFileSP objfile_sp); @@ -85,9 +85,7 @@ public: lldb_private::TypeList &type_list) override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: uint32_t CalculateNumCompileUnits() override; diff --git a/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp b/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp index 262ec87..a490829 100644 --- a/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp +++ b/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp @@ -976,19 +976,11 @@ SystemRuntimeMacOSX::ItemInfo SystemRuntimeMacOSX::ExtractItemInfoFromBuffer( } void SystemRuntimeMacOSX::Initialize() { - PluginManager::RegisterPlugin(GetPluginNameStatic(), - GetPluginDescriptionStatic(), CreateInstance); + PluginManager::RegisterPlugin( + GetPluginNameStatic(), + "System runtime plugin for Mac OS X native libraries.", CreateInstance); } void SystemRuntimeMacOSX::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -lldb_private::ConstString SystemRuntimeMacOSX::GetPluginNameStatic() { - static ConstString g_name("systemruntime-macosx"); - return g_name; -} - -const char *SystemRuntimeMacOSX::GetPluginDescriptionStatic() { - return "System runtime plugin for Mac OS X native libraries."; -} diff --git a/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h b/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h index 1ac8569..88c36a5 100644 --- a/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h +++ b/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h @@ -39,9 +39,9 @@ public: static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); - - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginNameStatic() { + return "systemruntime-macosx"; + } static lldb_private::SystemRuntime * CreateInstance(lldb_private::Process *process); @@ -98,9 +98,7 @@ public: bool SafeToCallFunctionsOnThisThread(lldb::ThreadSP thread_sp) override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: lldb::user_id_t m_break_id; diff --git a/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp b/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp index da5036e..92fb798d 100644 --- a/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp +++ b/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp @@ -62,8 +62,7 @@ TEST_F(SymbolFileDWARFTests, TestAbilitiesForDWARF) { SymbolFile *symfile = module->GetSymbolFile(); ASSERT_NE(nullptr, symfile); - EXPECT_EQ(symfile->GetPluginName(), - SymbolFileDWARF::GetPluginNameStatic().GetStringRef()); + EXPECT_EQ(symfile->GetPluginName(), SymbolFileDWARF::GetPluginNameStatic()); uint32_t expected_abilities = SymbolFile::kAllAbilities; EXPECT_EQ(expected_abilities, symfile->CalculateAbilities()); diff --git a/lldb/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp b/lldb/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp index d849801..7c7d190 100644 --- a/lldb/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp +++ b/lldb/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp @@ -153,8 +153,7 @@ TEST_F(SymbolFilePDBTests, TestAbilitiesForPDB) { SymbolFile *symfile = module->GetSymbolFile(); EXPECT_NE(nullptr, symfile); - EXPECT_EQ(symfile->GetPluginName(), - SymbolFilePDB::GetPluginNameStatic().GetStringRef()); + EXPECT_EQ(symfile->GetPluginName(), SymbolFilePDB::GetPluginNameStatic()); uint32_t expected_abilities = SymbolFile::kAllAbilities; EXPECT_EQ(expected_abilities, symfile->CalculateAbilities()); -- 2.7.4