Author: Pavel Labath Date: 2021-10-25T10:32:35+02:00 New Revision: 6fa1b4ff4b05b9b9a432f7310802255c160c8f4f
URL: https://github.com/llvm/llvm-project/commit/6fa1b4ff4b05b9b9a432f7310802255c160c8f4f DIFF: https://github.com/llvm/llvm-project/commit/6fa1b4ff4b05b9b9a432f7310802255c160c8f4f.diff LOG: Remove ConstString from DynamicLoader, JITLoader and Instruction plugin names Added: Modified: lldb/include/lldb/Core/PluginManager.h lldb/include/lldb/Target/DynamicLoader.h lldb/source/Core/DynamicLoader.cpp lldb/source/Core/EmulateInstruction.cpp lldb/source/Core/PluginManager.cpp lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.cpp lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.h lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.h lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.h lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.cpp lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.cpp lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.h lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.h lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.h lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.h lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp lldb/source/Plugins/Process/mach-core/ProcessMachCore.h lldb/source/Target/Process.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/Core/PluginManager.h b/lldb/include/lldb/Core/PluginManager.h index 3c79cd2e6c146..97f8dae1bcfd2 100644 --- a/lldb/include/lldb/Core/PluginManager.h +++ b/lldb/include/lldb/Core/PluginManager.h @@ -84,7 +84,7 @@ class PluginManager { // DynamicLoader static bool - RegisterPlugin(ConstString name, const char *description, + RegisterPlugin(llvm::StringRef name, llvm::StringRef description, DynamicLoaderCreateInstance create_callback, DebuggerInitializeCallback debugger_init_callback = nullptr); @@ -94,11 +94,11 @@ class PluginManager { GetDynamicLoaderCreateCallbackAtIndex(uint32_t idx); static DynamicLoaderCreateInstance - GetDynamicLoaderCreateCallbackForPluginName(ConstString name); + GetDynamicLoaderCreateCallbackForPluginName(llvm::StringRef name); // JITLoader static bool - RegisterPlugin(ConstString name, const char *description, + RegisterPlugin(llvm::StringRef name, llvm::StringRef description, JITLoaderCreateInstance create_callback, DebuggerInitializeCallback debugger_init_callback = nullptr); @@ -108,7 +108,7 @@ class PluginManager { GetJITLoaderCreateCallbackAtIndex(uint32_t idx); // EmulateInstruction - static bool RegisterPlugin(ConstString name, const char *description, + static bool RegisterPlugin(llvm::StringRef name, llvm::StringRef description, EmulateInstructionCreateInstance create_callback); static bool @@ -118,7 +118,7 @@ class PluginManager { GetEmulateInstructionCreateCallbackAtIndex(uint32_t idx); static EmulateInstructionCreateInstance - GetEmulateInstructionCreateCallbackForPluginName(ConstString name); + GetEmulateInstructionCreateCallbackForPluginName(llvm::StringRef name); // OperatingSystem static bool RegisterPlugin(llvm::StringRef name, llvm::StringRef description, diff --git a/lldb/include/lldb/Target/DynamicLoader.h b/lldb/include/lldb/Target/DynamicLoader.h index a904fac0c7790..84ad0f11fabb5 100644 --- a/lldb/include/lldb/Target/DynamicLoader.h +++ b/lldb/include/lldb/Target/DynamicLoader.h @@ -62,8 +62,9 @@ class DynamicLoader : public PluginInterface { /// /// \param[in] plugin_name /// An optional name of a specific dynamic loader plug-in that - /// should be used. If NULL, pick the best plug-in. - static DynamicLoader *FindPlugin(Process *process, const char *plugin_name); + /// should be used. If empty, pick the best plug-in. + static DynamicLoader *FindPlugin(Process *process, + llvm::StringRef plugin_name); /// Construct with a process. DynamicLoader(Process *process); diff --git a/lldb/source/Core/DynamicLoader.cpp b/lldb/source/Core/DynamicLoader.cpp index 10d2b72070181..1c7b9125e4d1b 100644 --- a/lldb/source/Core/DynamicLoader.cpp +++ b/lldb/source/Core/DynamicLoader.cpp @@ -30,13 +30,11 @@ using namespace lldb; using namespace lldb_private; DynamicLoader *DynamicLoader::FindPlugin(Process *process, - const char *plugin_name) { + llvm::StringRef plugin_name) { DynamicLoaderCreateInstance create_callback = nullptr; - if (plugin_name) { - ConstString const_plugin_name(plugin_name); + if (!plugin_name.empty()) { create_callback = - PluginManager::GetDynamicLoaderCreateCallbackForPluginName( - const_plugin_name); + PluginManager::GetDynamicLoaderCreateCallbackForPluginName(plugin_name); if (create_callback) { std::unique_ptr<DynamicLoader> instance_up( create_callback(process, true)); diff --git a/lldb/source/Core/EmulateInstruction.cpp b/lldb/source/Core/EmulateInstruction.cpp index 9b9111408209b..c352b01293825 100644 --- a/lldb/source/Core/EmulateInstruction.cpp +++ b/lldb/source/Core/EmulateInstruction.cpp @@ -46,10 +46,9 @@ EmulateInstruction::FindPlugin(const ArchSpec &arch, const char *plugin_name) { EmulateInstructionCreateInstance create_callback = nullptr; if (plugin_name) { - ConstString const_plugin_name(plugin_name); create_callback = PluginManager::GetEmulateInstructionCreateCallbackForPluginName( - const_plugin_name); + plugin_name); if (create_callback) { EmulateInstruction *emulate_insn_ptr = create_callback(arch, supported_inst_type); diff --git a/lldb/source/Core/PluginManager.cpp b/lldb/source/Core/PluginManager.cpp index 99d5af58bf967..ad2987f311fc9 100644 --- a/lldb/source/Core/PluginManager.cpp +++ b/lldb/source/Core/PluginManager.cpp @@ -383,11 +383,12 @@ static DynamicLoaderInstances &GetDynamicLoaderInstances() { } bool PluginManager::RegisterPlugin( - ConstString name, const char *description, + llvm::StringRef name, llvm::StringRef description, DynamicLoaderCreateInstance create_callback, DebuggerInitializeCallback debugger_init_callback) { return GetDynamicLoaderInstances().RegisterPlugin( - name, description, create_callback, debugger_init_callback); + ConstString(name), description.str().c_str(), create_callback, + debugger_init_callback); } bool PluginManager::UnregisterPlugin( @@ -401,8 +402,9 @@ PluginManager::GetDynamicLoaderCreateCallbackAtIndex(uint32_t idx) { } DynamicLoaderCreateInstance -PluginManager::GetDynamicLoaderCreateCallbackForPluginName(ConstString name) { - return GetDynamicLoaderInstances().GetCallbackForName(name); +PluginManager::GetDynamicLoaderCreateCallbackForPluginName( + llvm::StringRef name) { + return GetDynamicLoaderInstances().GetCallbackForName(ConstString(name)); } #pragma mark JITLoader @@ -416,11 +418,12 @@ static JITLoaderInstances &GetJITLoaderInstances() { } bool PluginManager::RegisterPlugin( - ConstString name, const char *description, + llvm::StringRef name, llvm::StringRef description, JITLoaderCreateInstance create_callback, DebuggerInitializeCallback debugger_init_callback) { return GetJITLoaderInstances().RegisterPlugin( - name, description, create_callback, debugger_init_callback); + ConstString(name), description.str().c_str(), create_callback, + debugger_init_callback); } bool PluginManager::UnregisterPlugin(JITLoaderCreateInstance create_callback) { @@ -444,10 +447,10 @@ static EmulateInstructionInstances &GetEmulateInstructionInstances() { } bool PluginManager::RegisterPlugin( - ConstString name, const char *description, + llvm::StringRef name, llvm::StringRef description, EmulateInstructionCreateInstance create_callback) { - return GetEmulateInstructionInstances().RegisterPlugin(name, description, - create_callback); + return GetEmulateInstructionInstances().RegisterPlugin( + ConstString(name), description.str().c_str(), create_callback); } bool PluginManager::UnregisterPlugin( @@ -462,8 +465,8 @@ PluginManager::GetEmulateInstructionCreateCallbackAtIndex(uint32_t idx) { EmulateInstructionCreateInstance PluginManager::GetEmulateInstructionCreateCallbackForPluginName( - ConstString name) { - return GetEmulateInstructionInstances().GetCallbackForName(name); + llvm::StringRef name) { + return GetEmulateInstructionInstances().GetCallbackForName(ConstString(name)); } #pragma mark OperatingSystem diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp index b45a221ffa586..5c5eb60f4d402 100644 --- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp +++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp @@ -1548,12 +1548,7 @@ void DynamicLoaderDarwinKernel::DebuggerInitialize( } } -lldb_private::ConstString DynamicLoaderDarwinKernel::GetPluginNameStatic() { - static ConstString g_name("darwin-kernel"); - return g_name; -} - -const char *DynamicLoaderDarwinKernel::GetPluginDescriptionStatic() { +llvm::StringRef DynamicLoaderDarwinKernel::GetPluginDescriptionStatic() { return "Dynamic loader plug-in that watches for shared library loads/unloads " "in the MacOSX kernel."; } diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h index c1e889403c268..38a60d154820a 100644 --- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h +++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h @@ -33,9 +33,9 @@ class DynamicLoaderDarwinKernel : public lldb_private::DynamicLoader { static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "darwin-kernel"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::DynamicLoader * CreateInstance(lldb_private::Process *process, bool force); @@ -58,9 +58,7 @@ class DynamicLoaderDarwinKernel : public lldb_private::DynamicLoader { lldb_private::Status CanLoadImage() override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: void PrivateInitialize(lldb_private::Process *process); diff --git a/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.cpp b/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.cpp index 86197acc078bb..82c50a32594b5 100644 --- a/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.cpp @@ -78,12 +78,7 @@ void DynamicLoaderHexagonDYLD::Initialize() { void DynamicLoaderHexagonDYLD::Terminate() {} -lldb_private::ConstString DynamicLoaderHexagonDYLD::GetPluginNameStatic() { - static ConstString g_name("hexagon-dyld"); - return g_name; -} - -const char *DynamicLoaderHexagonDYLD::GetPluginDescriptionStatic() { +llvm::StringRef DynamicLoaderHexagonDYLD::GetPluginDescriptionStatic() { return "Dynamic loader plug-in that watches for shared library " "loads/unloads in Hexagon processes."; } diff --git a/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.h b/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.h index f4594b0ee40a3..54711f5e6bb33 100644 --- a/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.h +++ b/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.h @@ -24,9 +24,9 @@ class DynamicLoaderHexagonDYLD : public lldb_private::DynamicLoader { static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "hexagon-dyld"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::DynamicLoader * CreateInstance(lldb_private::Process *process, bool force); @@ -47,9 +47,7 @@ class DynamicLoaderHexagonDYLD : public lldb_private::DynamicLoader { lldb::addr_t tls_file_addr) override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: /// Runtime linker rendezvous structure. diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp index 90a42c6c33d61..a9033d142a181 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp @@ -504,12 +504,7 @@ void DynamicLoaderMacOS::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString DynamicLoaderMacOS::GetPluginNameStatic() { - static ConstString g_name("macos-dyld"); - return g_name; -} - -const char *DynamicLoaderMacOS::GetPluginDescriptionStatic() { +llvm::StringRef DynamicLoaderMacOS::GetPluginDescriptionStatic() { return "Dynamic loader plug-in that watches for shared library loads/unloads " "in MacOSX user processes."; } diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.h b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.h index b9f54f2c798b0..a1796794eb467 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.h +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.h @@ -39,9 +39,9 @@ class DynamicLoaderMacOS : public lldb_private::DynamicLoaderDarwin { static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "macos-dyld"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::DynamicLoader * CreateInstance(lldb_private::Process *process, bool force); @@ -60,9 +60,7 @@ class DynamicLoaderMacOS : public lldb_private::DynamicLoaderDarwin { lldb_private::LazyBool &private_shared_cache) override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: void PutToLog(lldb_private::Log *log) const; diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp index 5ba238e69fc1e..c3cfd0afe5519 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp @@ -1136,12 +1136,7 @@ void DynamicLoaderMacOSXDYLD::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString DynamicLoaderMacOSXDYLD::GetPluginNameStatic() { - static ConstString g_name("macosx-dyld"); - return g_name; -} - -const char *DynamicLoaderMacOSXDYLD::GetPluginDescriptionStatic() { +llvm::StringRef DynamicLoaderMacOSXDYLD::GetPluginDescriptionStatic() { return "Dynamic loader plug-in that watches for shared library loads/unloads " "in MacOSX user processes."; } diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h index 697c78095f2f8..ae7451722a8d7 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h @@ -43,9 +43,9 @@ class DynamicLoaderMacOSXDYLD : public lldb_private::DynamicLoaderDarwin { static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "macosx-dyld"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::DynamicLoader * CreateInstance(lldb_private::Process *process, bool force); @@ -64,9 +64,7 @@ class DynamicLoaderMacOSXDYLD : public lldb_private::DynamicLoaderDarwin { lldb_private::LazyBool &private_shared_cache) override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } bool IsFullyInitialized() override; diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp index ecb5f769388f4..d9cbcce22c528 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp @@ -38,12 +38,7 @@ void DynamicLoaderPOSIXDYLD::Initialize() { void DynamicLoaderPOSIXDYLD::Terminate() {} -lldb_private::ConstString DynamicLoaderPOSIXDYLD::GetPluginNameStatic() { - static ConstString g_name("linux-dyld"); - return g_name; -} - -const char *DynamicLoaderPOSIXDYLD::GetPluginDescriptionStatic() { +llvm::StringRef DynamicLoaderPOSIXDYLD::GetPluginDescriptionStatic() { return "Dynamic loader plug-in that watches for shared library " "loads/unloads in POSIX processes."; } diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h index 09ada32e13ab6..422856e7a6606 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h @@ -30,9 +30,9 @@ class DynamicLoaderPOSIXDYLD : public lldb_private::DynamicLoader { static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "posix-dyld"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::DynamicLoader * CreateInstance(lldb_private::Process *process, bool force); @@ -53,9 +53,7 @@ class DynamicLoaderPOSIXDYLD : public lldb_private::DynamicLoader { lldb::addr_t tls_file_addr) override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: /// Runtime linker rendezvous structure. diff --git a/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp b/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp index 53a07fbee2970..a39aa2280ab86 100644 --- a/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp +++ b/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp @@ -152,12 +152,7 @@ void DynamicLoaderStatic::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -lldb_private::ConstString DynamicLoaderStatic::GetPluginNameStatic() { - static ConstString g_name("static"); - return g_name; -} - -const char *DynamicLoaderStatic::GetPluginDescriptionStatic() { +llvm::StringRef DynamicLoaderStatic::GetPluginDescriptionStatic() { return "Dynamic loader plug-in that will load any images at the static " "addresses contained in each image."; } diff --git a/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.h b/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.h index 87973d1dd3816..dac19dcd38d7d 100644 --- a/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.h +++ b/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.h @@ -23,9 +23,9 @@ class DynamicLoaderStatic : public lldb_private::DynamicLoader { static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "static"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::DynamicLoader * CreateInstance(lldb_private::Process *process, bool force); @@ -44,9 +44,7 @@ class DynamicLoaderStatic : public lldb_private::DynamicLoader { lldb_private::Status CanLoadImage() override; // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } private: void LoadAllImagesAtFileAddresses(); diff --git a/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.cpp b/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.cpp index 5c93cbc34c52b..bf6dc57003d52 100644 --- a/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.cpp @@ -37,12 +37,7 @@ void DynamicLoaderWindowsDYLD::Initialize() { void DynamicLoaderWindowsDYLD::Terminate() {} -ConstString DynamicLoaderWindowsDYLD::GetPluginNameStatic() { - static ConstString g_plugin_name("windows-dyld"); - return g_plugin_name; -} - -const char *DynamicLoaderWindowsDYLD::GetPluginDescriptionStatic() { +llvm::StringRef DynamicLoaderWindowsDYLD::GetPluginDescriptionStatic() { return "Dynamic loader plug-in that watches for shared library " "loads/unloads in Windows processes."; } diff --git a/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h b/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h index 8218e08de65b2..42ea5aacecb40 100644 --- a/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h +++ b/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h @@ -24,8 +24,8 @@ class DynamicLoaderWindowsDYLD : public DynamicLoader { static void Initialize(); static void Terminate(); - static ConstString GetPluginNameStatic(); - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginNameStatic() { return "windows-dyld"; } + static llvm::StringRef GetPluginDescriptionStatic(); static DynamicLoader *CreateInstance(Process *process, bool force); @@ -39,9 +39,7 @@ class DynamicLoaderWindowsDYLD : public DynamicLoader { lldb::ThreadPlanSP GetStepThroughTrampolinePlan(Thread &thread, bool stop) override; - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } protected: lldb::addr_t GetLoadAddress(lldb::ModuleSP executable); diff --git a/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.cpp b/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.cpp index ae7e011eaa52d..1634372bb9052 100644 --- a/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.cpp @@ -30,12 +30,7 @@ void DynamicLoaderWasmDYLD::Initialize() { GetPluginDescriptionStatic(), CreateInstance); } -ConstString DynamicLoaderWasmDYLD::GetPluginNameStatic() { - static ConstString g_plugin_name("wasm-dyld"); - return g_plugin_name; -} - -const char *DynamicLoaderWasmDYLD::GetPluginDescriptionStatic() { +llvm::StringRef DynamicLoaderWasmDYLD::GetPluginDescriptionStatic() { return "Dynamic loader plug-in that watches for shared library " "loads/unloads in WebAssembly engines."; } diff --git a/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h b/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h index f0ca265365241..fe67e58859042 100644 --- a/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h +++ b/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h @@ -21,8 +21,8 @@ class DynamicLoaderWasmDYLD : public DynamicLoader { static void Initialize(); static void Terminate() {} - static ConstString GetPluginNameStatic(); - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginNameStatic() { return "wasm-dyld"; } + static llvm::StringRef GetPluginDescriptionStatic(); static DynamicLoader *CreateInstance(Process *process, bool force); @@ -37,9 +37,7 @@ class DynamicLoaderWasmDYLD : public DynamicLoader { /// PluginInterface protocol. /// \{ - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } /// \} }; diff --git a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp index bf0bbdab740f4..5a238c5d4ac78 100644 --- a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp +++ b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp @@ -713,12 +713,7 @@ void EmulateInstructionARM::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -ConstString EmulateInstructionARM::GetPluginNameStatic() { - static ConstString g_name("arm"); - return g_name; -} - -const char *EmulateInstructionARM::GetPluginDescriptionStatic() { +llvm::StringRef EmulateInstructionARM::GetPluginDescriptionStatic() { return "Emulate instructions for the ARM architecture."; } diff --git a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h index a1b3a8c6937ed..8b167dd347ad7 100644 --- a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h +++ b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h @@ -62,9 +62,9 @@ class EmulateInstructionARM : public EmulateInstruction { static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "arm"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::EmulateInstruction * CreateInstance(const lldb_private::ArchSpec &arch, InstructionType inst_type); @@ -83,9 +83,7 @@ class EmulateInstructionARM : public EmulateInstruction { return false; } - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } bool SetTargetTriple(const ArchSpec &arch) override; diff --git a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp index 2c6c22bd2be2e..f86609f3c5c1c 100644 --- a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp +++ b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp @@ -117,12 +117,7 @@ void EmulateInstructionARM64::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -ConstString EmulateInstructionARM64::GetPluginNameStatic() { - ConstString g_plugin_name("lldb.emulate-instruction.arm64"); - return g_plugin_name; -} - -const char *EmulateInstructionARM64::GetPluginDescriptionStatic() { +llvm::StringRef EmulateInstructionARM64::GetPluginDescriptionStatic() { return "Emulate instructions for the ARM64 architecture."; } diff --git a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.h b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.h index c37192763d9f7..4f11f7387a2ec 100644 --- a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.h +++ b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.h @@ -24,9 +24,9 @@ class EmulateInstructionARM64 : public lldb_private::EmulateInstruction { static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "arm64"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::EmulateInstruction * CreateInstance(const lldb_private::ArchSpec &arch, @@ -46,9 +46,7 @@ class EmulateInstructionARM64 : public lldb_private::EmulateInstruction { return false; } - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } bool SetTargetTriple(const lldb_private::ArchSpec &arch) override; diff --git a/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp b/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp index 547befa01dfe9..ea9c95c55cbbc 100644 --- a/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp +++ b/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp @@ -193,12 +193,7 @@ void EmulateInstructionMIPS::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -ConstString EmulateInstructionMIPS::GetPluginNameStatic() { - ConstString g_plugin_name("lldb.emulate-instruction.mips32"); - return g_plugin_name; -} - -const char *EmulateInstructionMIPS::GetPluginDescriptionStatic() { +llvm::StringRef EmulateInstructionMIPS::GetPluginDescriptionStatic() { return "Emulate instructions for the MIPS32 architecture."; } diff --git a/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.h b/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.h index c993de539af96..48782186e0651 100644 --- a/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.h +++ b/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.h @@ -33,9 +33,9 @@ class EmulateInstructionMIPS : public lldb_private::EmulateInstruction { static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "mips32"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::EmulateInstruction * CreateInstance(const lldb_private::ArchSpec &arch, @@ -55,9 +55,7 @@ class EmulateInstructionMIPS : public lldb_private::EmulateInstruction { return false; } - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } bool SetTargetTriple(const lldb_private::ArchSpec &arch) override; diff --git a/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp b/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp index 3c96ee7d3cccc..e5732a50f3f26 100644 --- a/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp +++ b/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp @@ -180,12 +180,7 @@ void EmulateInstructionMIPS64::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -ConstString EmulateInstructionMIPS64::GetPluginNameStatic() { - ConstString g_plugin_name("lldb.emulate-instruction.mips64"); - return g_plugin_name; -} - -const char *EmulateInstructionMIPS64::GetPluginDescriptionStatic() { +llvm::StringRef EmulateInstructionMIPS64::GetPluginDescriptionStatic() { return "Emulate instructions for the MIPS64 architecture."; } diff --git a/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h b/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h index 892402a5341ea..acd956e613d4b 100644 --- a/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h +++ b/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h @@ -31,9 +31,9 @@ class EmulateInstructionMIPS64 : public lldb_private::EmulateInstruction { static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "mips64"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb_private::EmulateInstruction * CreateInstance(const lldb_private::ArchSpec &arch, @@ -53,9 +53,7 @@ class EmulateInstructionMIPS64 : public lldb_private::EmulateInstruction { return false; } - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } bool SetTargetTriple(const lldb_private::ArchSpec &arch) override; diff --git a/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp b/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp index 5f007461000f7..dcfad8e106aab 100644 --- a/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp +++ b/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp @@ -39,12 +39,7 @@ void EmulateInstructionPPC64::Terminate() { PluginManager::UnregisterPlugin(CreateInstance); } -ConstString EmulateInstructionPPC64::GetPluginNameStatic() { - ConstString g_plugin_name("lldb.emulate-instruction.ppc64"); - return g_plugin_name; -} - -const char *EmulateInstructionPPC64::GetPluginDescriptionStatic() { +llvm::StringRef EmulateInstructionPPC64::GetPluginDescriptionStatic() { return "Emulate instructions for the PPC64 architecture."; } diff --git a/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.h b/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.h index 2799ed7966a36..117ff8965eb5c 100644 --- a/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.h +++ b/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.h @@ -23,9 +23,9 @@ class EmulateInstructionPPC64 : public EmulateInstruction { static void Terminate(); - static ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "ppc64"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static EmulateInstruction *CreateInstance(const ArchSpec &arch, InstructionType inst_type); @@ -44,9 +44,7 @@ class EmulateInstructionPPC64 : public EmulateInstruction { return false; } - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } bool SetTargetTriple(const ArchSpec &arch) override; diff --git a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp index b40b27c44a51c..e4994e19710ce 100644 --- a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp +++ b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp @@ -90,7 +90,7 @@ enum { class PluginProperties : public Properties { public: static ConstString GetSettingName() { - return JITLoaderGDB::GetPluginNameStatic(); + return ConstString(JITLoaderGDB::GetPluginNameStatic()); } PluginProperties() { @@ -402,11 +402,6 @@ bool JITLoaderGDB::ReadJITDescriptorImpl(bool all_entries) { } // PluginInterface protocol -lldb_private::ConstString JITLoaderGDB::GetPluginNameStatic() { - static ConstString g_name("gdb"); - return g_name; -} - JITLoaderSP JITLoaderGDB::CreateInstance(Process *process, bool force) { JITLoaderSP jit_loader_sp; bool enable; @@ -427,7 +422,7 @@ JITLoaderSP JITLoaderGDB::CreateInstance(Process *process, bool force) { return jit_loader_sp; } -const char *JITLoaderGDB::GetPluginDescriptionStatic() { +llvm::StringRef JITLoaderGDB::GetPluginDescriptionStatic() { return "JIT loader plug-in that watches for JIT events using the GDB " "interface."; } diff --git a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.h b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.h index 60915474f17ca..2b337b3e9844e 100644 --- a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.h +++ b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.h @@ -25,9 +25,9 @@ class JITLoaderGDB : public lldb_private::JITLoader { static void Terminate(); - static lldb_private::ConstString GetPluginNameStatic(); + static llvm::StringRef GetPluginNameStatic() { return "gdb"; } - static const char *GetPluginDescriptionStatic(); + static llvm::StringRef GetPluginDescriptionStatic(); static lldb::JITLoaderSP CreateInstance(lldb_private::Process *process, bool force); @@ -35,9 +35,7 @@ class JITLoaderGDB : public lldb_private::JITLoader { static void DebuggerInitialize(lldb_private::Debugger &debugger); // PluginInterface protocol - llvm::StringRef GetPluginName() override { - return GetPluginNameStatic().GetStringRef(); - } + llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } // JITLoader interface void DidAttach() override; diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp index 088a2aed3ce7b..62b1987d1f17f 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -150,8 +150,8 @@ ProcessKDP::ProcessKDP(TargetSP target_sp, ListenerSP listener_sp) : Process(target_sp, listener_sp), m_comm("lldb.process.kdp-remote.communication"), m_async_broadcaster(NULL, "lldb.process.kdp-remote.async-broadcaster"), - m_dyld_plugin_name(), m_kernel_load_addr(LLDB_INVALID_ADDRESS), - m_command_sp(), m_kernel_thread_wp() { + m_kernel_load_addr(LLDB_INVALID_ADDRESS), m_command_sp(), + m_kernel_thread_wp() { m_async_broadcaster.SetEventName(eBroadcastBitAsyncThreadShouldExit, "async thread should exit"); m_async_broadcaster.SetEventName(eBroadcastBitAsyncContinue, @@ -268,8 +268,7 @@ Status ProcessKDP::DoConnectRemote(llvm::StringRef remote_url) { // Select an invalid plugin name for the dynamic loader so one // doesn't get used since EFI does its own manual loading via // python scripting - static ConstString g_none_dynamic_loader("none"); - m_dyld_plugin_name = g_none_dynamic_loader; + m_dyld_plugin_name = "none"; if (kernel_uuid.IsValid()) { // If EFI passed in a UUID= try to lookup UUID The slide will not @@ -398,9 +397,7 @@ addr_t ProcessKDP::GetImageInfoAddress() { return m_kernel_load_addr; } lldb_private::DynamicLoader *ProcessKDP::GetDynamicLoader() { if (m_dyld_up.get() == NULL) - m_dyld_up.reset(DynamicLoader::FindPlugin( - this, - m_dyld_plugin_name.IsEmpty() ? NULL : m_dyld_plugin_name.GetCString())); + m_dyld_up.reset(DynamicLoader::FindPlugin(this, m_dyld_plugin_name)); return m_dyld_up.get(); } diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h index 4373141589784..73dc5c07f289d 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h @@ -172,7 +172,7 @@ class ProcessKDP : public lldb_private::Process { CommunicationKDP m_comm; lldb_private::Broadcaster m_async_broadcaster; lldb_private::HostThread m_async_thread; - lldb_private::ConstString m_dyld_plugin_name; + llvm::StringRef m_dyld_plugin_name; lldb::addr_t m_kernel_load_addr; lldb::CommandObjectSP m_command_sp; lldb::ThreadWP m_kernel_thread_wp; diff --git a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp index f7ae421cc921a..4f85b6dcd465a 100644 --- a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp +++ b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp @@ -252,7 +252,7 @@ Status ProcessElfCore::DoLoadCore() { lldb_private::DynamicLoader *ProcessElfCore::GetDynamicLoader() { if (m_dyld_up.get() == nullptr) m_dyld_up.reset(DynamicLoader::FindPlugin( - this, DynamicLoaderPOSIXDYLD::GetPluginNameStatic().GetCString())); + this, DynamicLoaderPOSIXDYLD::GetPluginNameStatic())); return m_dyld_up.get(); } diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 92e1e57f84260..2823acfb66751 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -3891,7 +3891,7 @@ bool ProcessGDBRemote::StopNoticingNewThreads() { DynamicLoader *ProcessGDBRemote::GetDynamicLoader() { if (m_dyld_up.get() == nullptr) - m_dyld_up.reset(DynamicLoader::FindPlugin(this, nullptr)); + m_dyld_up.reset(DynamicLoader::FindPlugin(this, "")); return m_dyld_up.get(); } diff --git a/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp b/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp index 71197fbc37466..c2c60bc768ed7 100644 --- a/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp +++ b/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp @@ -116,7 +116,7 @@ ProcessMachCore::ProcessMachCore(lldb::TargetSP target_sp, : PostMortemProcess(target_sp, listener_sp), m_core_aranges(), m_core_range_infos(), m_core_module_sp(), m_core_file(core_file), m_dyld_addr(LLDB_INVALID_ADDRESS), - m_mach_kernel_addr(LLDB_INVALID_ADDRESS), m_dyld_plugin_name() {} + m_mach_kernel_addr(LLDB_INVALID_ADDRESS) {} // Destructor ProcessMachCore::~ProcessMachCore() { @@ -468,7 +468,7 @@ Status ProcessMachCore::DoLoadCore() { } } - if (m_dyld_plugin_name.IsEmpty()) { + if (m_dyld_plugin_name.empty()) { // If we found both a user-process dyld and a kernel binary, we need to // decide which to prefer. if (GetCorefilePreference() == eKernelCorefile) { @@ -538,9 +538,7 @@ Status ProcessMachCore::DoLoadCore() { lldb_private::DynamicLoader *ProcessMachCore::GetDynamicLoader() { if (m_dyld_up.get() == nullptr) - m_dyld_up.reset(DynamicLoader::FindPlugin( - this, m_dyld_plugin_name.IsEmpty() ? nullptr - : m_dyld_plugin_name.GetCString())); + m_dyld_up.reset(DynamicLoader::FindPlugin(this, m_dyld_plugin_name)); return m_dyld_up.get(); } diff --git a/lldb/source/Plugins/Process/mach-core/ProcessMachCore.h b/lldb/source/Plugins/Process/mach-core/ProcessMachCore.h index 72f7ae3de0e4f..a5ea76d0de5d8 100644 --- a/lldb/source/Plugins/Process/mach-core/ProcessMachCore.h +++ b/lldb/source/Plugins/Process/mach-core/ProcessMachCore.h @@ -120,7 +120,7 @@ class ProcessMachCore : public lldb_private::PostMortemProcess { lldb_private::FileSpec m_core_file; lldb::addr_t m_dyld_addr; lldb::addr_t m_mach_kernel_addr; - lldb_private::ConstString m_dyld_plugin_name; + llvm::StringRef m_dyld_plugin_name; }; #endif // LLDB_SOURCE_PLUGINS_PROCESS_MACH_CORE_PROCESSMACHCORE_H diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index bc2c4a1adb764..f4813d1ee4df6 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -2656,7 +2656,7 @@ Status Process::LoadCore() { DynamicLoader *Process::GetDynamicLoader() { if (!m_dyld_up) - m_dyld_up.reset(DynamicLoader::FindPlugin(this, nullptr)); + m_dyld_up.reset(DynamicLoader::FindPlugin(this, "")); return m_dyld_up.get(); } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
