Author: Pavel Labath Date: 2021-10-22T10:29:19+02:00 New Revision: b5e9f83ea48e29f0fe6d03354303179e5daaec1e
URL: https://github.com/llvm/llvm-project/commit/b5e9f83ea48e29f0fe6d03354303179e5daaec1e DIFF: https://github.com/llvm/llvm-project/commit/b5e9f83ea48e29f0fe6d03354303179e5daaec1e.diff LOG: [lldb] Remove ConstString from ABI, Architecture and Disassembler plugin names Added: Modified: lldb/include/lldb/Core/PluginManager.h lldb/source/Core/Disassembler.cpp lldb/source/Core/PluginManager.cpp lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp lldb/source/Plugins/ABI/ARC/ABISysV_arc.h lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp lldb/source/Plugins/ABI/ARM/ABISysV_arm.h lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.h lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp lldb/source/Plugins/ABI/Mips/ABISysV_mips.h lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp lldb/source/Plugins/ABI/X86/ABISysV_i386.h lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.h lldb/source/Plugins/Architecture/Arm/ArchitectureArm.cpp lldb/source/Plugins/Architecture/Arm/ArchitectureArm.h lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp lldb/source/Plugins/Architecture/Mips/ArchitectureMips.h lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.cpp lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.h lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.h Removed: ################################################################################ diff --git a/lldb/include/lldb/Core/PluginManager.h b/lldb/include/lldb/Core/PluginManager.h index 122c63183db27..3c79cd2e6c146 100644 --- a/lldb/include/lldb/Core/PluginManager.h +++ b/lldb/include/lldb/Core/PluginManager.h @@ -54,7 +54,7 @@ class PluginManager { static void Terminate(); // ABI - static bool RegisterPlugin(ConstString name, const char *description, + static bool RegisterPlugin(llvm::StringRef name, llvm::StringRef description, ABICreateInstance create_callback); static bool UnregisterPlugin(ABICreateInstance create_callback); @@ -62,7 +62,7 @@ class PluginManager { static ABICreateInstance GetABICreateCallbackAtIndex(uint32_t idx); // Architecture - static void RegisterPlugin(ConstString name, llvm::StringRef description, + static void RegisterPlugin(llvm::StringRef name, llvm::StringRef description, ArchitectureCreateInstance create_callback); static void UnregisterPlugin(ArchitectureCreateInstance create_callback); @@ -71,7 +71,7 @@ class PluginManager { CreateArchitectureInstance(const ArchSpec &arch); // Disassembler - static bool RegisterPlugin(ConstString name, const char *description, + static bool RegisterPlugin(llvm::StringRef name, llvm::StringRef description, DisassemblerCreateInstance create_callback); static bool UnregisterPlugin(DisassemblerCreateInstance create_callback); @@ -80,7 +80,7 @@ class PluginManager { GetDisassemblerCreateCallbackAtIndex(uint32_t idx); static DisassemblerCreateInstance - GetDisassemblerCreateCallbackForPluginName(ConstString name); + GetDisassemblerCreateCallbackForPluginName(llvm::StringRef name); // DynamicLoader static bool diff --git a/lldb/source/Core/Disassembler.cpp b/lldb/source/Core/Disassembler.cpp index d147f8fbb0dba..00d92053bc4f5 100644 --- a/lldb/source/Core/Disassembler.cpp +++ b/lldb/source/Core/Disassembler.cpp @@ -64,9 +64,8 @@ DisassemblerSP Disassembler::FindPlugin(const ArchSpec &arch, DisassemblerCreateInstance create_callback = nullptr; if (plugin_name) { - ConstString const_plugin_name(plugin_name); - create_callback = PluginManager::GetDisassemblerCreateCallbackForPluginName( - const_plugin_name); + create_callback = + PluginManager::GetDisassemblerCreateCallbackForPluginName(plugin_name); if (create_callback) { DisassemblerSP disassembler_sp(create_callback(arch, flavor)); diff --git a/lldb/source/Core/PluginManager.cpp b/lldb/source/Core/PluginManager.cpp index 39a412229d5fd..99d5af58bf967 100644 --- a/lldb/source/Core/PluginManager.cpp +++ b/lldb/source/Core/PluginManager.cpp @@ -285,9 +285,11 @@ static ABIInstances &GetABIInstances() { return g_instances; } -bool PluginManager::RegisterPlugin(ConstString name, const char *description, +bool PluginManager::RegisterPlugin(llvm::StringRef name, + llvm::StringRef description, ABICreateInstance create_callback) { - return GetABIInstances().RegisterPlugin(name, description, create_callback); + return GetABIInstances().RegisterPlugin( + ConstString(name), description.str().c_str(), create_callback); } bool PluginManager::UnregisterPlugin(ABICreateInstance create_callback) { @@ -308,11 +310,11 @@ static ArchitectureInstances &GetArchitectureInstances() { return g_instances; } -void PluginManager::RegisterPlugin(ConstString name, +void PluginManager::RegisterPlugin(llvm::StringRef name, llvm::StringRef description, ArchitectureCreateInstance create_callback) { GetArchitectureInstances().push_back( - {name, std::string(description), create_callback}); + {ConstString(name), std::string(description), create_callback}); } void PluginManager::UnregisterPlugin( @@ -347,10 +349,11 @@ static DisassemblerInstances &GetDisassemblerInstances() { return g_instances; } -bool PluginManager::RegisterPlugin(ConstString name, const char *description, +bool PluginManager::RegisterPlugin(llvm::StringRef name, + llvm::StringRef description, DisassemblerCreateInstance create_callback) { - return GetDisassemblerInstances().RegisterPlugin(name, description, - create_callback); + return GetDisassemblerInstances().RegisterPlugin( + ConstString(name), description.str().c_str(), create_callback); } bool PluginManager::UnregisterPlugin( @@ -364,8 +367,9 @@ PluginManager::GetDisassemblerCreateCallbackAtIndex(uint32_t idx) { } DisassemblerCreateInstance -PluginManager::GetDisassemblerCreateCallbackForPluginName(ConstString name) { - return GetDisassemblerInstances().GetCallbackForName(name); +PluginManager::GetDisassemblerCreateCallbackForPluginName( + llvm::StringRef name) { + return GetDisassemblerInstances().GetCallbackForName(ConstString(name)); } #pragma mark DynamicLoader diff --git a/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp index 8f2be706e89c8..2b5a038fbc91c 100644 --- a/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp +++ b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp @@ -828,10 +828,3 @@ void ABIMacOSX_arm64::Initialize() { void ABIMacOSX_arm64::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -// PluginInterface protocol - -ConstString ABIMacOSX_arm64::GetPluginNameStatic() { - static ConstString g_plugin_name("ABIMacOSX_arm64"); - return g_plugin_name; -} diff --git a/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h index 56cb5b868cbf0..1a5bc7f67573d 100644 --- a/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h +++ b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h @@ -74,11 +74,9 @@ class ABIMacOSX_arm64 : public ABIAArch64 { // PluginInterface protocol - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "ABIMacOSX_arm64"; } - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } lldb_private::Status SetReturnValueObject(lldb::StackFrameSP &frame_sp, diff --git a/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp index 3f770730d3118..95924159e9f03 100644 --- a/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp +++ b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp @@ -845,8 +845,3 @@ void ABISysV_arm64::Initialize() { void ABISysV_arm64::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -lldb_private::ConstString ABISysV_arm64::GetPluginNameStatic() { - static ConstString g_name("SysV-arm64"); - return g_name; -} diff --git a/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h index 6a68606e967d7..b3d4cba795f06 100644 --- a/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h +++ b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h @@ -77,13 +77,11 @@ class ABISysV_arm64 : public ABIAArch64 { static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "SysV-arm64"; } // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } lldb::addr_t FixCodeAddress(lldb::addr_t pc) override; lldb::addr_t FixDataAddress(lldb::addr_t pc) override; diff --git a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp index 73ad696d39035..3620be6f274d9 100644 --- a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp +++ b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp @@ -599,8 +599,3 @@ void ABISysV_arc::Initialize() { void ABISysV_arc::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -ConstString ABISysV_arc::GetPluginNameStatic() { - static ConstString g_name("sysv-arc"); - return g_name; -} diff --git a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.h b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.h index c0e682858a3d7..9bf75dfe6addb 100644 --- a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.h +++ b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.h @@ -1,4 +1,4 @@ -//===-- ArchitectureArc.h ---------------------------------------*- C++ -*-===// +//===-- ABISysV_arc.h -------------------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -80,15 +80,13 @@ class ABISysV_arc : public lldb_private::RegInfoBasedABI { static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "sysv-arc"; } //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } private: lldb::ValueObjectSP diff --git a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp index 3ecee7b7d7596..a8d1cbc675e36 100644 --- a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp +++ b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp @@ -1921,8 +1921,3 @@ void ABIMacOSX_arm::Initialize() { void ABIMacOSX_arm::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -lldb_private::ConstString ABIMacOSX_arm::GetPluginNameStatic() { - static ConstString g_name("macosx-arm"); - return g_name; -} diff --git a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h index 6612d71b4ee27..a77af75e57b8d 100644 --- a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h +++ b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h @@ -71,13 +71,11 @@ class ABIMacOSX_arm : public lldb_private::RegInfoBasedABI { static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "macosx-arm"; } // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: lldb::ValueObjectSP diff --git a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp index fb066bce6d292..9ed042df4e501 100644 --- a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp +++ b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp @@ -2027,8 +2027,3 @@ void ABISysV_arm::Initialize() { void ABISysV_arm::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -lldb_private::ConstString ABISysV_arm::GetPluginNameStatic() { - static ConstString g_name("SysV-arm"); - return g_name; -} diff --git a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.h b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.h index c86e0ac90c612..ce67b367d18f7 100644 --- a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.h +++ b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.h @@ -71,13 +71,11 @@ class ABISysV_arm : public lldb_private::RegInfoBasedABI { static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "SysV-arm"; } // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: lldb::ValueObjectSP diff --git a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp index 51c2f2e731881..d47bca48ae09f 100644 --- a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp +++ b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp @@ -1193,11 +1193,6 @@ void ABISysV_hexagon::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString ABISysV_hexagon::GetPluginNameStatic() { - static ConstString g_name("sysv-hexagon"); - return g_name; -} - // get value object specialized to work with llvm IR types lldb::ValueObjectSP ABISysV_hexagon::GetReturnValueObjectImpl(lldb_private::Thread &thread, diff --git a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.h b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.h index af6f1d7c2c44e..df7016926d797 100644 --- a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.h +++ b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.h @@ -79,13 +79,11 @@ class ABISysV_hexagon : public lldb_private::RegInfoBasedABI { static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "sysv-hexagon"; } // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: void CreateRegisterMapIfNeeded(); diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp index bd25deaba8485..662689ca06159 100644 --- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp +++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp @@ -1014,8 +1014,3 @@ void ABISysV_mips::Initialize() { void ABISysV_mips::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -lldb_private::ConstString ABISysV_mips::GetPluginNameStatic() { - static ConstString g_name("sysv-mips"); - return g_name; -} diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.h b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.h index ce4dba7e4860e..e77a8bfc0ab64 100644 --- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.h +++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.h @@ -69,13 +69,11 @@ class ABISysV_mips : public lldb_private::RegInfoBasedABI { static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "sysv-mips"; } // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: void CreateRegisterMapIfNeeded(); diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp index 229390a1109a4..7e272265e15d4 100644 --- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp +++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp @@ -1162,8 +1162,3 @@ void ABISysV_mips64::Initialize() { void ABISysV_mips64::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -lldb_private::ConstString ABISysV_mips64::GetPluginNameStatic() { - static ConstString g_name("sysv-mips64"); - return g_name; -} diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h index 61d6a624870f7..3eda3992e65e9 100644 --- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h +++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h @@ -82,13 +82,11 @@ class ABISysV_mips64 : public lldb_private::RegInfoBasedABI { static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "sysv-mips64"; } // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: void CreateRegisterMapIfNeeded(); diff --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp index e1e5c440bd53c..70b9c46d353f6 100644 --- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp +++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp @@ -962,8 +962,3 @@ void ABISysV_ppc::Initialize() { void ABISysV_ppc::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -lldb_private::ConstString ABISysV_ppc::GetPluginNameStatic() { - static ConstString g_name("sysv-ppc"); - return g_name; -} diff --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h index 2e3be0a229111..21b970f87934a 100644 --- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h +++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h @@ -78,13 +78,11 @@ class ABISysV_ppc : public lldb_private::RegInfoBasedABI { static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "sysv-ppc"; } // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: void CreateRegisterMapIfNeeded(); diff --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp index e0e6a4123955c..f9a2851d3949f 100644 --- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp +++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp @@ -1074,8 +1074,3 @@ void ABISysV_ppc64::Initialize() { void ABISysV_ppc64::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -lldb_private::ConstString ABISysV_ppc64::GetPluginNameStatic() { - static ConstString g_name("sysv-ppc64"); - return g_name; -} diff --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h index 1592332a10d9f..bfa96cc0df703 100644 --- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h +++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h @@ -78,13 +78,11 @@ class ABISysV_ppc64 : public lldb_private::RegInfoBasedABI { static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "sysv-ppc64"; } // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: void CreateRegisterMapIfNeeded(); diff --git a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp index 8b4989f710829..f8156deb7e306 100644 --- a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp +++ b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp @@ -716,8 +716,3 @@ void ABISysV_s390x::Initialize() { void ABISysV_s390x::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -lldb_private::ConstString ABISysV_s390x::GetPluginNameStatic() { - static ConstString g_name("sysv-s390x"); - return g_name; -} diff --git a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h index 042f7709248db..f6c248dc59baa 100644 --- a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h +++ b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h @@ -70,13 +70,11 @@ class ABISysV_s390x : public lldb_private::RegInfoBasedABI { static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "sysv-s390x"; } // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: void CreateRegisterMapIfNeeded(); diff --git a/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp index 79267e0ff3dd5..69adeee4742b8 100644 --- a/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp +++ b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp @@ -460,8 +460,3 @@ void ABIMacOSX_i386::Initialize() { void ABIMacOSX_i386::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -lldb_private::ConstString ABIMacOSX_i386::GetPluginNameStatic() { - static ConstString g_short_name("abi.macosx-i386"); - return g_short_name; -} diff --git a/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h index 062da54d4131d..462317f17666c 100644 --- a/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h +++ b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h @@ -75,11 +75,9 @@ class ABIMacOSX_i386 : public ABIX86_i386 { // PluginInterface protocol - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "abi.macosx-i386"; } - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: lldb::ValueObjectSP diff --git a/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp b/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp index 7b03bfacab6fd..054e28f5c7a61 100644 --- a/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp +++ b/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp @@ -714,10 +714,3 @@ void ABISysV_i386::Initialize() { void ABISysV_i386::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -// PluginInterface protocol - -lldb_private::ConstString ABISysV_i386::GetPluginNameStatic() { - static ConstString g_name("sysv-i386"); - return g_name; -} diff --git a/lldb/source/Plugins/ABI/X86/ABISysV_i386.h b/lldb/source/Plugins/ABI/X86/ABISysV_i386.h index a98359fd26f6d..a19c8ddb5b645 100644 --- a/lldb/source/Plugins/ABI/X86/ABISysV_i386.h +++ b/lldb/source/Plugins/ABI/X86/ABISysV_i386.h @@ -83,11 +83,9 @@ class ABISysV_i386 : public ABIX86_i386 { // PluginInterface protocol - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "sysv-i386"; } - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: lldb::ValueObjectSP diff --git a/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp index 794747d56708b..b51ee5c485156 100644 --- a/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp +++ b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp @@ -952,8 +952,3 @@ void ABISysV_x86_64::Initialize() { void ABISysV_x86_64::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -lldb_private::ConstString ABISysV_x86_64::GetPluginNameStatic() { - static ConstString g_name("sysv-x86_64"); - return g_name; -} diff --git a/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h index d7627034f3fd1..ce0357dfa331f 100644 --- a/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h +++ b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h @@ -76,12 +76,10 @@ class ABISysV_x86_64 : public ABIX86_64 { static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "sysv-x86_64"; } // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: void CreateRegisterMapIfNeeded(); diff --git a/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp index 87e191a22d8de..5e8f8b16ec1ab 100644 --- a/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp +++ b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp @@ -823,8 +823,3 @@ void ABIWindows_x86_64::Initialize() { void ABIWindows_x86_64::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } - -lldb_private::ConstString ABIWindows_x86_64::GetPluginNameStatic() { - static ConstString g_name("windows-x86_64"); - return g_name; -} diff --git a/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h index b2a6d8550a310..e74b9126404e1 100644 --- a/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h +++ b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h @@ -67,15 +67,13 @@ class ABIWindows_x86_64 : public ABIX86_64 { static lldb::ABISP CreateInstance(lldb::ProcessSP process_sp, const lldb_private::ArchSpec &arch); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "windows-x86_64"; } //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: void CreateRegisterMapIfNeeded(); diff --git a/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp b/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp index 286dd01aad515..1b2b41ee87587 100644 --- a/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp +++ b/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp @@ -15,10 +15,6 @@ using namespace lldb; LLDB_PLUGIN_DEFINE(ArchitectureAArch64) -ConstString ArchitectureAArch64::GetPluginNameStatic() { - return ConstString("aarch64"); -} - void ArchitectureAArch64::Initialize() { PluginManager::RegisterPlugin(GetPluginNameStatic(), "AArch64-specific algorithms", diff --git a/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.h b/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.h index 1a9f816282250..e1b8558e1cda0 100644 --- a/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.h +++ b/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.h @@ -16,13 +16,11 @@ namespace lldb_private { class ArchitectureAArch64 : public Architecture { public: - static ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "aarch64"; } static void Initialize(); static void Terminate(); - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } void OverrideStopInfo(Thread &thread) const override{}; diff --git a/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.cpp b/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.cpp index c9b307ee929ef..bb44675e842e7 100644 --- a/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.cpp +++ b/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.cpp @@ -19,10 +19,6 @@ using namespace lldb; LLDB_PLUGIN_DEFINE(ArchitectureArm) -ConstString ArchitectureArm::GetPluginNameStatic() { - return ConstString("arm"); -} - void ArchitectureArm::Initialize() { PluginManager::RegisterPlugin(GetPluginNameStatic(), "Arm-specific algorithms", diff --git a/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.h b/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.h index 48bfdff314ae4..f579d6b625051 100644 --- a/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.h +++ b/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.h @@ -15,13 +15,11 @@ namespace lldb_private { class ArchitectureArm : public Architecture { public: - static ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "arm"; } static void Initialize(); static void Terminate(); - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } void OverrideStopInfo(Thread &thread) const override; diff --git a/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp b/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp index a6977a2a6151f..865c72fed61c3 100644 --- a/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp +++ b/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp @@ -23,10 +23,6 @@ using namespace lldb; LLDB_PLUGIN_DEFINE(ArchitectureMips) -ConstString ArchitectureMips::GetPluginNameStatic() { - return ConstString("mips"); -} - void ArchitectureMips::Initialize() { PluginManager::RegisterPlugin(GetPluginNameStatic(), "Mips-specific algorithms", diff --git a/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.h b/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.h index 5d5f164dbf326..9513a10b59651 100644 --- a/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.h +++ b/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.h @@ -16,13 +16,11 @@ namespace lldb_private { class ArchitectureMips : public Architecture { public: - static ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "mips"; } static void Initialize(); static void Terminate(); - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } void OverrideStopInfo(Thread &thread) const override {} diff --git a/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.cpp b/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.cpp index 4b35947d99e9d..b8fac55e41da7 100644 --- a/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.cpp +++ b/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.cpp @@ -22,10 +22,6 @@ using namespace lldb; LLDB_PLUGIN_DEFINE(ArchitecturePPC64) -ConstString ArchitecturePPC64::GetPluginNameStatic() { - return ConstString("ppc64"); -} - void ArchitecturePPC64::Initialize() { PluginManager::RegisterPlugin(GetPluginNameStatic(), "PPC64-specific algorithms", diff --git a/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.h b/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.h index 5457ff5b39e5e..80f7f27b54cce 100644 --- a/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.h +++ b/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.h @@ -15,13 +15,11 @@ namespace lldb_private { class ArchitecturePPC64 : public Architecture { public: - static ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "ppc64"; } static void Initialize(); static void Terminate(); - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } void OverrideStopInfo(Thread &thread) const override {} diff --git a/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp index 5b4f16d3506b2..2cf32bdd3800c 100644 --- a/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp +++ b/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp @@ -1295,11 +1295,6 @@ void DisassemblerLLVMC::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -ConstString DisassemblerLLVMC::GetPluginNameStatic() { - static ConstString g_name("llvm-mc"); - return g_name; -} - int DisassemblerLLVMC::OpInfoCallback(void *disassembler, uint64_t pc, uint64_t offset, uint64_t size, int tag_type, void *tag_bug) { diff --git a/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.h b/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.h index a842b01131147..5d0204caaa9aa 100644 --- a/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.h +++ b/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.h @@ -32,7 +32,7 @@ class DisassemblerLLVMC : public lldb_private::Disassembler { static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "llvm-mc"; } static lldb_private::Disassembler * CreateInstance(const lldb_private::ArchSpec &arch, const char *flavor); @@ -43,9 +43,7 @@ class DisassemblerLLVMC : public lldb_private::Disassembler { bool append, bool data_from_file) override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: friend class InstructionLLVMC; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits