[Lldb-commits] [lldb] a3939e1 - [lldb] Return StringRef from PluginInterface::GetPluginName
Pavel Labath via lldb-commits
lldb-commits at lists.llvm.org
Mon Oct 18 01:17:11 PDT 2021
Author: Pavel Labath
Date: 2021-10-18T10:14:42+02:00
New Revision: a3939e159fc9528b097672794035a1cdfda520e8
URL: https://github.com/llvm/llvm-project/commit/a3939e159fc9528b097672794035a1cdfda520e8
DIFF: https://github.com/llvm/llvm-project/commit/a3939e159fc9528b097672794035a1cdfda520e8.diff
LOG: [lldb] Return StringRef from PluginInterface::GetPluginName
There is no reason why this function should be returning a ConstString.
While modifying these files, I also fixed several instances where
GetPluginName and GetPluginNameStatic were returning different strings.
I am not changing the return type of GetPluginNameStatic in this patch, as that
would necessitate additional changes, and this patch is big enough as it is.
Differential Revision: https://reviews.llvm.org/D111877
Added:
Modified:
lldb/include/lldb/Core/PluginInterface.h
lldb/include/lldb/Symbol/SymbolVendor.h
lldb/include/lldb/Target/Process.h
lldb/include/lldb/Target/ProcessTrace.h
lldb/include/lldb/Target/TraceExporter.h
lldb/source/API/SBDebugger.cpp
lldb/source/API/SBProcess.cpp
lldb/source/Commands/CommandObjectPlatform.cpp
lldb/source/Commands/CommandObjectThread.cpp
lldb/source/Commands/CommandObjectTrace.cpp
lldb/source/Core/Debugger.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
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.h
lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionSourceCode.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/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.h
lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.h
lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.h
lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.h
lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.h
lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h
lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp
lldb/source/Plugins/Language/ObjC/ObjCLanguage.h
lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp
lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h
lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.h
lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h
lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h
lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp
lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.h
lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h
lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.h
lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.h
lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.h
lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h
lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
lldb/source/Plugins/Platform/Android/PlatformAndroid.h
lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h
lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
lldb/source/Plugins/Platform/Linux/PlatformLinux.h
lldb/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp
lldb/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.h
lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h
lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.h
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleBridge.h
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleTV.h
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.h
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteDarwinDevice.cpp
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteMacOSX.h
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.h
lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp
lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.h
lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
lldb/source/Plugins/Platform/Windows/PlatformWindows.cpp
lldb/source/Plugins/Platform/Windows/PlatformWindows.h
lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h
lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
lldb/source/Plugins/Process/Windows/Common/ProcessWindows.h
lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
lldb/source/Plugins/Process/elf-core/ProcessElfCore.h
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp
lldb/source/Plugins/Process/mach-core/ProcessMachCore.h
lldb/source/Plugins/Process/minidump/ProcessMinidump.cpp
lldb/source/Plugins/Process/minidump/ProcessMinidump.h
lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
lldb/source/Plugins/Process/scripted/ScriptedProcess.h
lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp
lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h
lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp
lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.h
lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h
lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.h
lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h
lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h
lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp
lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h
lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.h
lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h
lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp
lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.h
lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp
lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h
lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp
lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.h
lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.cpp
lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.h
lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h
lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h
lldb/source/Symbol/SymbolVendor.cpp
lldb/source/Target/Platform.cpp
lldb/source/Target/Process.cpp
lldb/source/Target/ProcessTrace.cpp
lldb/source/Target/RemoteAwarePlatform.cpp
lldb/source/Target/Trace.cpp
lldb/test/Shell/SymbolFile/NativePDB/locate-pdb.cpp
lldb/unittests/Expression/DWARFExpressionTest.cpp
lldb/unittests/Language/CLanguages/CLanguagesTest.cpp
lldb/unittests/Process/ProcessEventDataTest.cpp
lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp
lldb/unittests/Target/ExecutionContextTest.cpp
lldb/unittests/Target/RemoteAwarePlatformTest.cpp
lldb/unittests/Thread/ThreadTest.cpp
Removed:
################################################################################
diff --git a/lldb/include/lldb/Core/PluginInterface.h b/lldb/include/lldb/Core/PluginInterface.h
index 2a8fb6211647f..e9fd2b263a9eb 100644
--- a/lldb/include/lldb/Core/PluginInterface.h
+++ b/lldb/include/lldb/Core/PluginInterface.h
@@ -9,7 +9,7 @@
#ifndef LLDB_CORE_PLUGININTERFACE_H
#define LLDB_CORE_PLUGININTERFACE_H
-#include "lldb/lldb-private.h"
+#include "llvm/ADT/StringRef.h"
namespace lldb_private {
@@ -18,7 +18,7 @@ class PluginInterface {
PluginInterface() = default;
virtual ~PluginInterface() = default;
- virtual ConstString GetPluginName() = 0;
+ virtual llvm::StringRef GetPluginName() = 0;
PluginInterface(const PluginInterface &) = delete;
PluginInterface &operator=(const PluginInterface &) = delete;
diff --git a/lldb/include/lldb/Symbol/SymbolVendor.h b/lldb/include/lldb/Symbol/SymbolVendor.h
index e9749a5a3d9a8..b060ac95b75a3 100644
--- a/lldb/include/lldb/Symbol/SymbolVendor.h
+++ b/lldb/include/lldb/Symbol/SymbolVendor.h
@@ -41,7 +41,7 @@ class SymbolVendor : public ModuleChild, public PluginInterface {
SymbolFile *GetSymbolFile() { return m_sym_file_up.get(); }
// PluginInterface protocol
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override { return "vendor-default"; }
protected:
std::unique_ptr<SymbolFile> m_sym_file_up; // A single symbol file. Subclasses
diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h
index 5f4c1272ef28d..7ac53d3336cdf 100644
--- a/lldb/include/lldb/Target/Process.h
+++ b/lldb/include/lldb/Target/Process.h
@@ -610,9 +610,8 @@ class Process : public std::enable_shared_from_this<Process>,
virtual Status DoLoadCore() {
Status error;
- error.SetErrorStringWithFormat(
- "error: %s does not support loading core files.",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support loading core files.", GetPluginName());
return error;
}
@@ -941,9 +940,9 @@ class Process : public std::enable_shared_from_this<Process>,
virtual Status DoAttachToProcessWithID(lldb::pid_t pid,
const ProcessAttachInfo &attach_info) {
Status error;
- error.SetErrorStringWithFormat(
- "error: %s does not support attaching to a process by pid",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support attaching to a process by pid",
+ GetPluginName());
return error;
}
@@ -1026,9 +1025,8 @@ class Process : public std::enable_shared_from_this<Process>,
/// operation.
virtual Status DoLaunch(Module *exe_module, ProcessLaunchInfo &launch_info) {
Status error;
- error.SetErrorStringWithFormat(
- "error: %s does not support launching processes",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support launching processes", GetPluginName());
return error;
}
@@ -1062,9 +1060,8 @@ class Process : public std::enable_shared_from_this<Process>,
/// \see Thread:Suspend()
virtual Status DoResume() {
Status error;
- error.SetErrorStringWithFormat(
- "error: %s does not support resuming processes",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support resuming processes", GetPluginName());
return error;
}
@@ -1098,9 +1095,8 @@ class Process : public std::enable_shared_from_this<Process>,
/// otherwise.
virtual Status DoHalt(bool &caused_stop) {
Status error;
- error.SetErrorStringWithFormat(
- "error: %s does not support halting processes",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support halting processes", GetPluginName());
return error;
}
@@ -1125,9 +1121,9 @@ class Process : public std::enable_shared_from_this<Process>,
/// false otherwise.
virtual Status DoDetach(bool keep_stopped) {
Status error;
- error.SetErrorStringWithFormat(
- "error: %s does not support detaching from processes",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support detaching from processes",
+ GetPluginName());
return error;
}
@@ -1156,9 +1152,9 @@ class Process : public std::enable_shared_from_this<Process>,
/// Returns an error object.
virtual Status DoSignal(int signal) {
Status error;
- error.SetErrorStringWithFormat(
- "error: %s does not support sending signals to processes",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support sending signals to processes",
+ GetPluginName());
return error;
}
@@ -1585,9 +1581,8 @@ class Process : public std::enable_shared_from_this<Process>,
/// The number of bytes that were actually written.
virtual size_t DoWriteMemory(lldb::addr_t vm_addr, const void *buf,
size_t size, Status &error) {
- error.SetErrorStringWithFormat(
- "error: %s does not support writing to processes",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support writing to processes", GetPluginName());
return 0;
}
@@ -1669,9 +1664,9 @@ class Process : public std::enable_shared_from_this<Process>,
virtual lldb::addr_t DoAllocateMemory(size_t size, uint32_t permissions,
Status &error) {
- error.SetErrorStringWithFormat(
- "error: %s does not support allocating in the debug process",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support allocating in the debug process",
+ GetPluginName());
return LLDB_INVALID_ADDRESS;
}
@@ -1924,9 +1919,9 @@ class Process : public std::enable_shared_from_this<Process>,
/// \btrue if the memory was deallocated, \bfalse otherwise.
virtual Status DoDeallocateMemory(lldb::addr_t ptr) {
Status error;
- error.SetErrorStringWithFormat(
- "error: %s does not support deallocating in the debug process",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support deallocating in the debug process",
+ GetPluginName());
return error;
}
@@ -2044,17 +2039,15 @@ class Process : public std::enable_shared_from_this<Process>,
virtual Status EnableBreakpointSite(BreakpointSite *bp_site) {
Status error;
- error.SetErrorStringWithFormat(
- "error: %s does not support enabling breakpoints",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support enabling breakpoints", GetPluginName());
return error;
}
virtual Status DisableBreakpointSite(BreakpointSite *bp_site) {
Status error;
- error.SetErrorStringWithFormat(
- "error: %s does not support disabling breakpoints",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support disabling breakpoints", GetPluginName());
return error;
}
@@ -2813,9 +2806,10 @@ void PruneThreadPlans();
/// if the read failed.
virtual llvm::Expected<std::vector<uint8_t>>
DoReadMemoryTags(lldb::addr_t addr, size_t len, int32_t type) {
- return llvm::createStringError(llvm::inconvertibleErrorCode(),
- "%s does not support reading memory tags",
- GetPluginName().GetCString());
+ return llvm::createStringError(
+ llvm::inconvertibleErrorCode(),
+ llvm::formatv("{0} does not support reading memory tags",
+ GetPluginName()));
}
/// Does the final operation to write memory tags. E.g. sending a GDB packet.
@@ -2838,8 +2832,10 @@ void PruneThreadPlans();
/// Status telling you whether the write succeeded.
virtual Status DoWriteMemoryTags(lldb::addr_t addr, size_t len, int32_t type,
const std::vector<uint8_t> &tags) {
- return Status("%s does not support writing memory tags",
- GetPluginName().GetCString());
+ Status status;
+ status.SetErrorStringWithFormatv("{0} does not support writing memory tags",
+ GetPluginName());
+ return status;
}
// Type definitions
diff --git a/lldb/include/lldb/Target/ProcessTrace.h b/lldb/include/lldb/Target/ProcessTrace.h
index fd209deccae6b..8fa7928910d7d 100644
--- a/lldb/include/lldb/Target/ProcessTrace.h
+++ b/lldb/include/lldb/Target/ProcessTrace.h
@@ -40,7 +40,9 @@ class ProcessTrace : public PostMortemProcess {
SystemRuntime *GetSystemRuntime() override { return nullptr; }
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
Status DoDestroy() override;
@@ -48,9 +50,8 @@ class ProcessTrace : public PostMortemProcess {
Status WillResume() override {
Status error;
- error.SetErrorStringWithFormat(
- "error: %s does not support resuming processes",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support resuming processes", GetPluginName());
return error;
}
diff --git a/lldb/include/lldb/Target/TraceExporter.h b/lldb/include/lldb/Target/TraceExporter.h
index 6560b39fd42ea..d5a06c499a6e2 100644
--- a/lldb/include/lldb/Target/TraceExporter.h
+++ b/lldb/include/lldb/Target/TraceExporter.h
@@ -10,6 +10,8 @@
#define LLDB_TARGET_TRACE_EXPORTER_H
#include "lldb/Core/PluginInterface.h"
+#include "lldb/lldb-forward.h"
+#include "llvm/Support/Error.h"
namespace lldb_private {
diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp
index a854c22bb2144..d044061fb0e40 100644
--- a/lldb/source/API/SBDebugger.cpp
+++ b/lldb/source/API/SBDebugger.cpp
@@ -1133,8 +1133,7 @@ SBStructuredData SBDebugger::GetAvailablePlatformInfoAtIndex(uint32_t idx) {
if (idx == 0) {
PlatformSP host_platform_sp(Platform::GetHostPlatform());
- platform_dict->AddStringItem(
- name_str, host_platform_sp->GetPluginName().GetStringRef());
+ platform_dict->AddStringItem(name_str, host_platform_sp->GetPluginName());
platform_dict->AddStringItem(
desc_str, llvm::StringRef(host_platform_sp->GetDescription()));
} else if (idx > 0) {
diff --git a/lldb/source/API/SBProcess.cpp b/lldb/source/API/SBProcess.cpp
index a965814be1b98..acdf75a603160 100644
--- a/lldb/source/API/SBProcess.cpp
+++ b/lldb/source/API/SBProcess.cpp
@@ -88,7 +88,7 @@ const char *SBProcess::GetPluginName() {
ProcessSP process_sp(GetSP());
if (process_sp) {
- return process_sp->GetPluginName().GetCString();
+ return ConstString(process_sp->GetPluginName()).GetCString();
}
return "<Unknown>";
}
@@ -98,7 +98,7 @@ const char *SBProcess::GetShortPluginName() {
ProcessSP process_sp(GetSP());
if (process_sp) {
- return process_sp->GetPluginName().GetCString();
+ return ConstString(process_sp->GetPluginName()).GetCString();
}
return "<Unknown>";
}
diff --git a/lldb/source/Commands/CommandObjectPlatform.cpp b/lldb/source/Commands/CommandObjectPlatform.cpp
index 6bfb4c8a0689c..188d85389b7fa 100644
--- a/lldb/source/Commands/CommandObjectPlatform.cpp
+++ b/lldb/source/Commands/CommandObjectPlatform.cpp
@@ -211,7 +211,7 @@ class CommandObjectPlatformList : public CommandObjectParsed {
ostrm.Printf("Available platforms:\n");
PlatformSP host_platform_sp(Platform::GetHostPlatform());
- ostrm.Printf("%s: %s\n", host_platform_sp->GetPluginName().GetCString(),
+ ostrm.Format("{0}: {1}\n", host_platform_sp->GetPluginName(),
host_platform_sp->GetDescription());
uint32_t idx;
@@ -346,8 +346,8 @@ class CommandObjectPlatformDisconnect : public CommandObjectParsed {
if (error.Success()) {
Stream &ostrm = result.GetOutputStream();
if (hostname.empty())
- ostrm.Printf("Disconnected from \"%s\"\n",
- platform_sp->GetPluginName().GetCString());
+ ostrm.Format("Disconnected from \"{0}\"\n",
+ platform_sp->GetPluginName());
else
ostrm.Printf("Disconnected from \"%s\"\n", hostname.c_str());
result.SetStatus(eReturnStatusSuccessFinishResult);
@@ -356,9 +356,8 @@ class CommandObjectPlatformDisconnect : public CommandObjectParsed {
}
} else {
// Not connected...
- result.AppendErrorWithFormat(
- "not connected to '%s'",
- platform_sp->GetPluginName().GetCString());
+ result.AppendErrorWithFormatv("not connected to '{0}'",
+ platform_sp->GetPluginName());
}
} else {
// Bad args
@@ -1289,15 +1288,14 @@ class CommandObjectPlatformProcessList : public CommandObjectParsed {
if (matches == 0) {
if (match_desc)
- result.AppendErrorWithFormat(
- "no processes were found that %s \"%s\" on the \"%s\" "
+ result.AppendErrorWithFormatv(
+ "no processes were found that {0} \"{1}\" on the \"{2}\" "
"platform\n",
- match_desc, match_name,
- platform_sp->GetPluginName().GetCString());
+ match_desc, match_name, platform_sp->GetPluginName());
else
- result.AppendErrorWithFormat(
- "no processes were found on the \"%s\" platform\n",
- platform_sp->GetPluginName().GetCString());
+ result.AppendErrorWithFormatv(
+ "no processes were found on the \"{0}\" platform\n",
+ platform_sp->GetPluginName());
} else {
result.AppendMessageWithFormat(
"%u matching process%s found on \"%s\"", matches,
@@ -1543,9 +1541,8 @@ class CommandObjectPlatformProcessInfo : public CommandObjectParsed {
}
} else {
// Not connected...
- result.AppendErrorWithFormat(
- "not connected to '%s'",
- platform_sp->GetPluginName().GetCString());
+ result.AppendErrorWithFormatv("not connected to '{0}'",
+ platform_sp->GetPluginName());
}
} else {
// No args
diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp
index 1534959989d3e..7a4760225a580 100644
--- a/lldb/source/Commands/CommandObjectThread.cpp
+++ b/lldb/source/Commands/CommandObjectThread.cpp
@@ -2199,9 +2199,8 @@ class CommandObjectTraceDumpInfo : public CommandObjectIterateOverThreads {
bool DoExecute(Args &command, CommandReturnObject &result) override {
Target &target = m_exe_ctx.GetTargetRef();
- result.GetOutputStream().Printf(
- "Trace technology: %s\n",
- target.GetTrace()->GetPluginName().AsCString());
+ result.GetOutputStream().Format("Trace technology: {0}\n",
+ target.GetTrace()->GetPluginName());
return CommandObjectIterateOverThreads::DoExecute(command, result);
}
diff --git a/lldb/source/Commands/CommandObjectTrace.cpp b/lldb/source/Commands/CommandObjectTrace.cpp
index c55fed45d4f49..62ee48ca05469 100644
--- a/lldb/source/Commands/CommandObjectTrace.cpp
+++ b/lldb/source/Commands/CommandObjectTrace.cpp
@@ -117,8 +117,8 @@ class CommandObjectTraceLoad : public CommandObjectParsed {
json_file.GetDirectory().AsCString())) {
lldb::TraceSP trace_sp = traceOrErr.get();
if (m_options.m_verbose && trace_sp)
- result.AppendMessageWithFormat("loading trace with plugin %s\n",
- trace_sp->GetPluginName().AsCString());
+ result.AppendMessageWithFormatv("loading trace with plugin {0}\n",
+ trace_sp->GetPluginName());
} else
return end_with_failure(traceOrErr.takeError());
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index 1ddd95726f0c9..0c73bdd58c9dd 100644
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -1423,10 +1423,9 @@ void Debugger::HandleProcessEvent(const EventSP &event_sp) {
output_stream_sp->PutCString(content_stream.GetString());
}
} else {
- error_stream_sp->Printf("Failed to print structured "
- "data with plugin %s: %s",
- plugin_sp->GetPluginName().AsCString(),
- error.AsCString());
+ error_stream_sp->Format("Failed to print structured "
+ "data with plugin {0}: {1}",
+ plugin_sp->GetPluginName(), error);
}
}
}
diff --git a/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h
index a97e6b6108741..56cb5b868cbf0 100644
--- a/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h
+++ b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h
@@ -76,8 +76,8 @@ class ABIMacOSX_arm64 : public ABIAArch64 {
static lldb_private::ConstString GetPluginNameStatic();
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
lldb_private::Status
diff --git a/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp
index d2ee08018f28f..3f770730d3118 100644
--- a/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp
+++ b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp
@@ -850,7 +850,3 @@ lldb_private::ConstString ABISysV_arm64::GetPluginNameStatic() {
static ConstString g_name("SysV-arm64");
return g_name;
}
-
-// PluginInterface protocol
-
-ConstString ABISysV_arm64::GetPluginName() { return GetPluginNameStatic(); }
diff --git a/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h
index c01023be4aaa9..6a68606e967d7 100644
--- a/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h
+++ b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h
@@ -81,7 +81,9 @@ class ABISysV_arm64 : public ABIAArch64 {
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 b7369179b1d7a..73ad696d39035 100644
--- a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp
+++ b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp
@@ -604,11 +604,3 @@ ConstString ABISysV_arc::GetPluginNameStatic() {
static ConstString g_name("sysv-arc");
return g_name;
}
-
-//------------------------------------------------------------------
-// PluginInterface protocol
-//------------------------------------------------------------------
-
-ConstString ABISysV_arc::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.h b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.h
index 62aec7b566de6..c0e682858a3d7 100644
--- a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.h
+++ b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.h
@@ -86,7 +86,9 @@ class ABISysV_arc : public lldb_private::RegInfoBasedABI {
// PluginInterface protocol
//------------------------------------------------------------------
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
private:
lldb::ValueObjectSP
diff --git a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
index 93939800cd69c..3ecee7b7d7596 100644
--- a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
+++ b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
@@ -1926,9 +1926,3 @@ lldb_private::ConstString ABIMacOSX_arm::GetPluginNameStatic() {
static ConstString g_name("macosx-arm");
return g_name;
}
-
-// PluginInterface protocol
-
-lldb_private::ConstString ABIMacOSX_arm::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h
index 37bda9e52ce54..6612d71b4ee27 100644
--- a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h
+++ b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h
@@ -75,7 +75,9 @@ class ABIMacOSX_arm : public lldb_private::RegInfoBasedABI {
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
lldb::ValueObjectSP
diff --git a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
index 43f277eff9cad..fb066bce6d292 100644
--- a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
+++ b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
@@ -2032,9 +2032,3 @@ lldb_private::ConstString ABISysV_arm::GetPluginNameStatic() {
static ConstString g_name("SysV-arm");
return g_name;
}
-
-// PluginInterface protocol
-
-lldb_private::ConstString ABISysV_arm::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.h b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.h
index fe2d274c90d0d..c86e0ac90c612 100644
--- a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.h
+++ b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.h
@@ -75,7 +75,9 @@ class ABISysV_arm : public lldb_private::RegInfoBasedABI {
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
lldb::ValueObjectSP
diff --git a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp
index 07ea8a6b4baa2..51c2f2e731881 100644
--- a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp
+++ b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp
@@ -1198,12 +1198,6 @@ lldb_private::ConstString ABISysV_hexagon::GetPluginNameStatic() {
return g_name;
}
-// PluginInterface protocol
-
-lldb_private::ConstString ABISysV_hexagon::GetPluginName() {
- return GetPluginNameStatic();
-}
-
// 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 6698f0c953bd2..af6f1d7c2c44e 100644
--- a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.h
+++ b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.h
@@ -83,7 +83,9 @@ class ABISysV_hexagon : public lldb_private::RegInfoBasedABI {
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
void CreateRegisterMapIfNeeded();
diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
index ac0531a0ec195..bd25deaba8485 100644
--- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
+++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
@@ -1019,9 +1019,3 @@ lldb_private::ConstString ABISysV_mips::GetPluginNameStatic() {
static ConstString g_name("sysv-mips");
return g_name;
}
-
-// PluginInterface protocol
-
-lldb_private::ConstString ABISysV_mips::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.h b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.h
index cd61139a6672a..ce4dba7e4860e 100644
--- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.h
+++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.h
@@ -73,7 +73,9 @@ class ABISysV_mips : public lldb_private::RegInfoBasedABI {
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
void CreateRegisterMapIfNeeded();
diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
index 9aa390cdb52e5..229390a1109a4 100644
--- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
+++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
@@ -1167,9 +1167,3 @@ lldb_private::ConstString ABISysV_mips64::GetPluginNameStatic() {
static ConstString g_name("sysv-mips64");
return g_name;
}
-
-// PluginInterface protocol
-
-lldb_private::ConstString ABISysV_mips64::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h
index 5f94be00dc4e9..61d6a624870f7 100644
--- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h
+++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h
@@ -86,7 +86,9 @@ class ABISysV_mips64 : public lldb_private::RegInfoBasedABI {
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
void CreateRegisterMapIfNeeded();
diff --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
index 579eb0809ffd3..e1e5c440bd53c 100644
--- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
+++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
@@ -967,9 +967,3 @@ lldb_private::ConstString ABISysV_ppc::GetPluginNameStatic() {
static ConstString g_name("sysv-ppc");
return g_name;
}
-
-// PluginInterface protocol
-
-lldb_private::ConstString ABISysV_ppc::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h
index 128ed361d4540..2e3be0a229111 100644
--- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h
+++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h
@@ -82,7 +82,9 @@ class ABISysV_ppc : public lldb_private::RegInfoBasedABI {
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
void CreateRegisterMapIfNeeded();
diff --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp
index f8d63e8821695..e0e6a4123955c 100644
--- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp
+++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp
@@ -1079,9 +1079,3 @@ lldb_private::ConstString ABISysV_ppc64::GetPluginNameStatic() {
static ConstString g_name("sysv-ppc64");
return g_name;
}
-
-// PluginInterface protocol
-
-lldb_private::ConstString ABISysV_ppc64::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h
index 5d52ece9abe94..1592332a10d9f 100644
--- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h
+++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h
@@ -82,7 +82,9 @@ class ABISysV_ppc64 : public lldb_private::RegInfoBasedABI {
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
void CreateRegisterMapIfNeeded();
diff --git a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
index f20266878b975..8b4989f710829 100644
--- a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
+++ b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
@@ -721,9 +721,3 @@ lldb_private::ConstString ABISysV_s390x::GetPluginNameStatic() {
static ConstString g_name("sysv-s390x");
return g_name;
}
-
-// PluginInterface protocol
-
-lldb_private::ConstString ABISysV_s390x::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h
index 36efe1e0617c3..042f7709248db 100644
--- a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h
+++ b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h
@@ -74,7 +74,9 @@ class ABISysV_s390x : public lldb_private::RegInfoBasedABI {
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
void CreateRegisterMapIfNeeded();
diff --git a/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp
index 0a5d42242ba03..79267e0ff3dd5 100644
--- a/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp
+++ b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp
@@ -465,9 +465,3 @@ lldb_private::ConstString ABIMacOSX_i386::GetPluginNameStatic() {
static ConstString g_short_name("abi.macosx-i386");
return g_short_name;
}
-
-// PluginInterface protocol
-
-lldb_private::ConstString ABIMacOSX_i386::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h
index 4c54645a6f953..062da54d4131d 100644
--- a/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h
+++ b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h
@@ -77,7 +77,9 @@ class ABIMacOSX_i386 : public ABIX86_i386 {
static lldb_private::ConstString GetPluginNameStatic();
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
lldb::ValueObjectSP
diff --git a/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp b/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp
index 7d2f0a64d679a..7b03bfacab6fd 100644
--- a/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp
+++ b/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp
@@ -721,7 +721,3 @@ lldb_private::ConstString ABISysV_i386::GetPluginNameStatic() {
static ConstString g_name("sysv-i386");
return g_name;
}
-
-lldb_private::ConstString ABISysV_i386::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/ABI/X86/ABISysV_i386.h b/lldb/source/Plugins/ABI/X86/ABISysV_i386.h
index c3a584366b2a4..a98359fd26f6d 100644
--- a/lldb/source/Plugins/ABI/X86/ABISysV_i386.h
+++ b/lldb/source/Plugins/ABI/X86/ABISysV_i386.h
@@ -85,7 +85,9 @@ class ABISysV_i386 : public ABIX86_i386 {
static lldb_private::ConstString GetPluginNameStatic();
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 f53cd9a19a7db..794747d56708b 100644
--- a/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp
+++ b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp
@@ -957,9 +957,3 @@ lldb_private::ConstString ABISysV_x86_64::GetPluginNameStatic() {
static ConstString g_name("sysv-x86_64");
return g_name;
}
-
-// PluginInterface protocol
-
-lldb_private::ConstString ABISysV_x86_64::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h
index eb17ed5c2a5f9..d7627034f3fd1 100644
--- a/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h
+++ b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h
@@ -79,8 +79,9 @@ class ABISysV_x86_64 : public ABIX86_64 {
static lldb_private::ConstString GetPluginNameStatic();
// PluginInterface protocol
-
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 b2b5d5b828772..87e191a22d8de 100644
--- a/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp
+++ b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp
@@ -828,11 +828,3 @@ lldb_private::ConstString ABIWindows_x86_64::GetPluginNameStatic() {
static ConstString g_name("windows-x86_64");
return g_name;
}
-
-//------------------------------------------------------------------
-// PluginInterface protocol
-//------------------------------------------------------------------
-
-lldb_private::ConstString ABIWindows_x86_64::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h
index e1737d9d7a03e..b2a6d8550a310 100644
--- a/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h
+++ b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h
@@ -73,7 +73,9 @@ class ABIWindows_x86_64 : public ABIX86_64 {
// PluginInterface protocol
//------------------------------------------------------------------
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
void CreateRegisterMapIfNeeded();
diff --git a/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp b/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp
index a62a9a8f31314..286dd01aad515 100644
--- a/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp
+++ b/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp
@@ -38,7 +38,3 @@ ArchitectureAArch64::Create(const ArchSpec &arch) {
}
return std::unique_ptr<Architecture>(new ArchitectureAArch64());
}
-
-ConstString ArchitectureAArch64::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.h b/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.h
index 686711d0b0f97..1a9f816282250 100644
--- a/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.h
+++ b/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.h
@@ -20,7 +20,9 @@ class ArchitectureAArch64 : public Architecture {
static void Initialize();
static void Terminate();
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 765777a63cdcf..c9b307ee929ef 100644
--- a/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.cpp
+++ b/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.cpp
@@ -39,8 +39,6 @@ std::unique_ptr<Architecture> ArchitectureArm::Create(const ArchSpec &arch) {
return std::unique_ptr<Architecture>(new ArchitectureArm());
}
-ConstString ArchitectureArm::GetPluginName() { return GetPluginNameStatic(); }
-
void ArchitectureArm::OverrideStopInfo(Thread &thread) const {
// We need to check if we are stopped in Thumb mode in a IT instruction and
// detect if the condition doesn't pass. If this is the case it means we
diff --git a/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.h b/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.h
index 33a7f8bfe5932..48bfdff314ae4 100644
--- a/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.h
+++ b/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.h
@@ -19,7 +19,9 @@ class ArchitectureArm : public Architecture {
static void Initialize();
static void Terminate();
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 c3de75f1dcde4..a6977a2a6151f 100644
--- a/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp
+++ b/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp
@@ -42,8 +42,6 @@ std::unique_ptr<Architecture> ArchitectureMips::Create(const ArchSpec &arch) {
std::unique_ptr<Architecture>(new ArchitectureMips(arch)) : nullptr;
}
-ConstString ArchitectureMips::GetPluginName() { return GetPluginNameStatic(); }
-
addr_t ArchitectureMips::GetCallableLoadAddress(addr_t code_addr,
AddressClass addr_class) const {
bool is_alternate_isa = false;
diff --git a/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.h b/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.h
index eb6028cfa6286..5d5f164dbf326 100644
--- a/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.h
+++ b/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.h
@@ -20,7 +20,9 @@ class ArchitectureMips : public Architecture {
static void Initialize();
static void Terminate();
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 cf1567ac76d03..4b35947d99e9d 100644
--- a/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.cpp
+++ b/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.cpp
@@ -43,8 +43,6 @@ std::unique_ptr<Architecture> ArchitecturePPC64::Create(const ArchSpec &arch) {
return nullptr;
}
-ConstString ArchitecturePPC64::GetPluginName() { return GetPluginNameStatic(); }
-
static int32_t GetLocalEntryOffset(const Symbol &sym) {
unsigned char other = sym.GetFlags() >> 8 & 0xFF;
return llvm::ELF::decodePPC64LocalEntryOffset(other);
diff --git a/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.h b/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.h
index e2ca827bda444..5457ff5b39e5e 100644
--- a/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.h
+++ b/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.h
@@ -19,7 +19,9 @@ class ArchitecturePPC64 : public Architecture {
static void Initialize();
static void Terminate();
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 bc6176477d532..5b4f16d3506b2 100644
--- a/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
+++ b/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
@@ -1461,6 +1461,3 @@ const char *DisassemblerLLVMC::SymbolLookup(uint64_t value, uint64_t *type_ptr,
*name = nullptr;
return nullptr;
}
-
-// PluginInterface protocol
-ConstString DisassemblerLLVMC::GetPluginName() { return GetPluginNameStatic(); }
diff --git a/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.h b/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.h
index 0b9fb78cbacd1..a842b01131147 100644
--- a/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.h
+++ b/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.h
@@ -43,7 +43,9 @@ class DisassemblerLLVMC : public lldb_private::Disassembler {
bool append, bool data_from_file) override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
friend class InstructionLLVMC;
diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
index fd4dd1dfa3a58..b45a221ffa586 100644
--- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
@@ -803,10 +803,9 @@ bool DynamicLoaderDarwinKernel::KextImageInfo::LoadImageUsingMemoryModule(
// system.
PlatformSP platform_sp(target.GetPlatform());
if (!m_module_sp && platform_sp) {
- ConstString platform_name(platform_sp->GetPluginName());
static ConstString g_platform_name(
PlatformDarwinKernel::GetPluginNameStatic());
- if (platform_name == g_platform_name) {
+ if (platform_sp->GetPluginName() == g_platform_name.GetStringRef()) {
ModuleSpec kext_bundle_module_spec(module_spec);
FileSpec kext_filespec(m_name.c_str());
FileSpecList search_paths = target.GetExecutableSearchPaths();
@@ -1559,11 +1558,6 @@ const char *DynamicLoaderDarwinKernel::GetPluginDescriptionStatic() {
"in the MacOSX kernel.";
}
-// PluginInterface protocol
-lldb_private::ConstString DynamicLoaderDarwinKernel::GetPluginName() {
- return GetPluginNameStatic();
-}
-
lldb::ByteOrder
DynamicLoaderDarwinKernel::GetByteOrderFromMagic(uint32_t magic) {
switch (magic) {
diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h
index 8bf60496c6cab..c1e889403c268 100644
--- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h
+++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h
@@ -58,7 +58,9 @@ class DynamicLoaderDarwinKernel : public lldb_private::DynamicLoader {
lldb_private::Status CanLoadImage() override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 1ed83a3eae477..86197acc078bb 100644
--- a/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.cpp
@@ -78,10 +78,6 @@ void DynamicLoaderHexagonDYLD::Initialize() {
void DynamicLoaderHexagonDYLD::Terminate() {}
-lldb_private::ConstString DynamicLoaderHexagonDYLD::GetPluginName() {
- return GetPluginNameStatic();
-}
-
lldb_private::ConstString DynamicLoaderHexagonDYLD::GetPluginNameStatic() {
static ConstString g_name("hexagon-dyld");
return g_name;
diff --git a/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.h b/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.h
index 2597d3d4c8500..f4594b0ee40a3 100644
--- a/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.h
+++ b/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD/DynamicLoaderHexagonDYLD.h
@@ -47,7 +47,9 @@ class DynamicLoaderHexagonDYLD : public lldb_private::DynamicLoader {
lldb::addr_t tls_file_addr) override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 bedd100e147e4..90a42c6c33d61 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp
@@ -513,8 +513,3 @@ const char *DynamicLoaderMacOS::GetPluginDescriptionStatic() {
return "Dynamic loader plug-in that watches for shared library loads/unloads "
"in MacOSX user processes.";
}
-
-// PluginInterface protocol
-lldb_private::ConstString DynamicLoaderMacOS::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.h b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.h
index 03aa98b53f9a9..b9f54f2c798b0 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.h
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.h
@@ -60,7 +60,9 @@ class DynamicLoaderMacOS : public lldb_private::DynamicLoaderDarwin {
lldb_private::LazyBool &private_shared_cache) override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 4affa83c55551..5ba238e69fc1e 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
@@ -1146,11 +1146,6 @@ const char *DynamicLoaderMacOSXDYLD::GetPluginDescriptionStatic() {
"in MacOSX user processes.";
}
-// PluginInterface protocol
-lldb_private::ConstString DynamicLoaderMacOSXDYLD::GetPluginName() {
- return GetPluginNameStatic();
-}
-
uint32_t DynamicLoaderMacOSXDYLD::AddrByteSize() {
std::lock_guard<std::recursive_mutex> baseclass_guard(GetMutex());
diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h
index 2e83e5a2746a8..697c78095f2f8 100644
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h
@@ -64,7 +64,9 @@ class DynamicLoaderMacOSXDYLD : public lldb_private::DynamicLoaderDarwin {
lldb_private::LazyBool &private_shared_cache) override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
bool IsFullyInitialized() override;
diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
index 7732f27d27caa..ecb5f769388f4 100644
--- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
+++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
@@ -38,10 +38,6 @@ void DynamicLoaderPOSIXDYLD::Initialize() {
void DynamicLoaderPOSIXDYLD::Terminate() {}
-lldb_private::ConstString DynamicLoaderPOSIXDYLD::GetPluginName() {
- return GetPluginNameStatic();
-}
-
lldb_private::ConstString DynamicLoaderPOSIXDYLD::GetPluginNameStatic() {
static ConstString g_name("linux-dyld");
return g_name;
diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h
index 678da1d73d114..09ada32e13ab6 100644
--- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h
+++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h
@@ -53,7 +53,9 @@ class DynamicLoaderPOSIXDYLD : public lldb_private::DynamicLoader {
lldb::addr_t tls_file_addr) override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
/// Runtime linker rendezvous structure.
diff --git a/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp b/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp
index d4abad41c3628..53a07fbee2970 100644
--- a/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp
@@ -161,8 +161,3 @@ const char *DynamicLoaderStatic::GetPluginDescriptionStatic() {
return "Dynamic loader plug-in that will load any images at the static "
"addresses contained in each image.";
}
-
-// PluginInterface protocol
-lldb_private::ConstString DynamicLoaderStatic::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.h b/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.h
index 8a6e31e87d25f..87973d1dd3816 100644
--- a/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.h
+++ b/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.h
@@ -44,7 +44,9 @@ class DynamicLoaderStatic : public lldb_private::DynamicLoader {
lldb_private::Status CanLoadImage() override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
private:
void LoadAllImagesAtFileAddresses();
diff --git a/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.cpp b/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.cpp
index a32aa49108083..5c93cbc34c52b 100644
--- a/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.cpp
@@ -174,10 +174,6 @@ void DynamicLoaderWindowsDYLD::DidLaunch() {
Status DynamicLoaderWindowsDYLD::CanLoadImage() { return Status(); }
-ConstString DynamicLoaderWindowsDYLD::GetPluginName() {
- return GetPluginNameStatic();
-}
-
ThreadPlanSP
DynamicLoaderWindowsDYLD::GetStepThroughTrampolinePlan(Thread &thread,
bool stop) {
diff --git a/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h b/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h
index 9d1217d5fbb76..8218e08de65b2 100644
--- a/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h
+++ b/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h
@@ -39,7 +39,9 @@ class DynamicLoaderWindowsDYLD : public DynamicLoader {
lldb::ThreadPlanSP GetStepThroughTrampolinePlan(Thread &thread,
bool stop) override;
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
lldb::addr_t GetLoadAddress(lldb::ModuleSP executable);
diff --git a/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h b/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h
index 91fd5b2bc420d..f0ca265365241 100644
--- a/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h
+++ b/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h
@@ -37,7 +37,9 @@ class DynamicLoaderWasmDYLD : public DynamicLoader {
/// PluginInterface protocol.
/// \{
- ConstString GetPluginName() override { return GetPluginNameStatic(); }
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
/// \}
};
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionSourceCode.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionSourceCode.cpp
index 31707f81a270a..977a461e3f6f0 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionSourceCode.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionSourceCode.cpp
@@ -311,8 +311,7 @@ bool ClangExpressionSourceCode::GetText(
}
if (target->GetArchitecture().GetMachine() == llvm::Triple::x86_64) {
if (lldb::PlatformSP platform_sp = target->GetPlatform()) {
- static ConstString g_platform_ios_simulator("ios-simulator");
- if (platform_sp->GetPluginName() == g_platform_ios_simulator) {
+ if (platform_sp->GetPluginName() == "ios-simulator") {
target_specific_defines = "typedef bool BOOL;\n";
}
}
diff --git a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
index 824a1a127df03..a1b3a8c6937ed 100644
--- a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
+++ b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
@@ -83,8 +83,8 @@ class EmulateInstructionARM : public EmulateInstruction {
return false;
}
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
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 ab5a5d07de906..2c6c22bd2be2e 100644
--- a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
+++ b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
@@ -122,11 +122,6 @@ ConstString EmulateInstructionARM64::GetPluginNameStatic() {
return g_plugin_name;
}
-lldb_private::ConstString EmulateInstructionARM64::GetPluginName() {
- static ConstString g_plugin_name("EmulateInstructionARM64");
- return g_plugin_name;
-}
-
const char *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 10a54c3371a14..c37192763d9f7 100644
--- a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.h
+++ b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.h
@@ -46,7 +46,9 @@ class EmulateInstructionARM64 : public lldb_private::EmulateInstruction {
return false;
}
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 6eb1aaead5847..547befa01dfe9 100644
--- a/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
+++ b/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
@@ -198,11 +198,6 @@ ConstString EmulateInstructionMIPS::GetPluginNameStatic() {
return g_plugin_name;
}
-lldb_private::ConstString EmulateInstructionMIPS::GetPluginName() {
- static ConstString g_plugin_name("EmulateInstructionMIPS");
- return g_plugin_name;
-}
-
const char *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 60dc24e39b7f3..c993de539af96 100644
--- a/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.h
+++ b/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.h
@@ -55,7 +55,9 @@ class EmulateInstructionMIPS : public lldb_private::EmulateInstruction {
return false;
}
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 4a5c7ffbce336..3c96ee7d3cccc 100644
--- a/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp
+++ b/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp
@@ -185,11 +185,6 @@ ConstString EmulateInstructionMIPS64::GetPluginNameStatic() {
return g_plugin_name;
}
-lldb_private::ConstString EmulateInstructionMIPS64::GetPluginName() {
- static ConstString g_plugin_name("EmulateInstructionMIPS64");
- return g_plugin_name;
-}
-
const char *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 a4d414846a1ca..892402a5341ea 100644
--- a/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h
+++ b/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h
@@ -53,7 +53,9 @@ class EmulateInstructionMIPS64 : public lldb_private::EmulateInstruction {
return false;
}
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 4e78c369c128a..5f007461000f7 100644
--- a/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp
+++ b/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp
@@ -44,11 +44,6 @@ ConstString EmulateInstructionPPC64::GetPluginNameStatic() {
return g_plugin_name;
}
-ConstString EmulateInstructionPPC64::GetPluginName() {
- static ConstString g_plugin_name("EmulateInstructionPPC64");
- return g_plugin_name;
-}
-
const char *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 8fdac1a2d3a0f..2799ed7966a36 100644
--- a/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.h
+++ b/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.h
@@ -44,7 +44,9 @@ class EmulateInstructionPPC64 : public EmulateInstruction {
return false;
}
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
bool SetTargetTriple(const ArchSpec &arch) override;
diff --git a/lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.h b/lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.h
index c7145b073e227..53d13b5e5b8cf 100644
--- a/lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.h
+++ b/lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.h
@@ -31,8 +31,8 @@ class InstrumentationRuntimeASan : public lldb_private::InstrumentationRuntime {
static lldb::InstrumentationRuntimeType GetTypeStatic();
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
virtual lldb::InstrumentationRuntimeType GetType() { return GetTypeStatic(); }
diff --git a/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.h b/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.h
index 32e2a787e74f7..011ca9dfeec40 100644
--- a/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.h
+++ b/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.h
@@ -32,8 +32,8 @@ class InstrumentationRuntimeMainThreadChecker
static lldb::InstrumentationRuntimeType GetTypeStatic();
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
virtual lldb::InstrumentationRuntimeType GetType() { return GetTypeStatic(); }
diff --git a/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.h b/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.h
index 0d2d5ace52289..97e174e3c6529 100644
--- a/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.h
+++ b/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.h
@@ -31,8 +31,8 @@ class InstrumentationRuntimeTSan : public lldb_private::InstrumentationRuntime {
static lldb::InstrumentationRuntimeType GetTypeStatic();
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
virtual lldb::InstrumentationRuntimeType GetType() { return GetTypeStatic(); }
diff --git a/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.h b/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.h
index 4823ed6ee46f9..6c9f47ecd7ff0 100644
--- a/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.h
+++ b/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.h
@@ -32,8 +32,8 @@ class InstrumentationRuntimeUBSan
static lldb::InstrumentationRuntimeType GetTypeStatic();
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
virtual lldb::InstrumentationRuntimeType GetType() { return GetTypeStatic(); }
diff --git a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
index 8cd6b92a7495d..b40b27c44a51c 100644
--- a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
+++ b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
@@ -432,10 +432,6 @@ const char *JITLoaderGDB::GetPluginDescriptionStatic() {
"interface.";
}
-lldb_private::ConstString JITLoaderGDB::GetPluginName() {
- return GetPluginNameStatic();
-}
-
void JITLoaderGDB::Initialize() {
PluginManager::RegisterPlugin(GetPluginNameStatic(),
GetPluginDescriptionStatic(), CreateInstance,
diff --git a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.h b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.h
index c094678311f19..60915474f17ca 100644
--- a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.h
+++ b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.h
@@ -35,7 +35,9 @@ class JITLoaderGDB : public lldb_private::JITLoader {
static void DebuggerInitialize(lldb_private::Debugger &debugger);
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
// JITLoader interface
void DidAttach() override;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
index bc3142f10134a..6dd0a07780f12 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
@@ -95,12 +95,6 @@ ConstString CPlusPlusLanguage::GetDemangledFunctionNameWithoutArguments(
return mangled.GetMangledName();
}
-// PluginInterface protocol
-
-lldb_private::ConstString CPlusPlusLanguage::GetPluginName() {
- return GetPluginNameStatic();
-}
-
// Static Functions
Language *CPlusPlusLanguage::CreateInstance(lldb::LanguageType language) {
@@ -1095,7 +1089,8 @@ lldb::TypeCategoryImplSP CPlusPlusLanguage::GetFormatters() {
static TypeCategoryImplSP g_category;
llvm::call_once(g_initialize, [this]() -> void {
- DataVisualization::Categories::GetCategory(GetPluginName(), g_category);
+ DataVisualization::Categories::GetCategory(ConstString(GetPluginName()),
+ g_category);
if (g_category) {
LoadLibStdcppFormatters(g_category);
LoadLibCxxFormatters(g_category);
diff --git a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h
index 855e3302d9ce6..eebb4093a91e8 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h
+++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h
@@ -134,7 +134,9 @@ class CPlusPlusLanguage : public Language {
const Mangled mangled, const SymbolContext &sym_ctx) const override;
// PluginInterface protocol
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
};
} // namespace lldb_private
diff --git a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp
index c5b7b1256e03e..7aeaf7aebc1a7 100644
--- a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp
+++ b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp
@@ -53,12 +53,6 @@ lldb_private::ConstString ObjCLanguage::GetPluginNameStatic() {
return g_name;
}
-// PluginInterface protocol
-
-lldb_private::ConstString ObjCLanguage::GetPluginName() {
- return GetPluginNameStatic();
-}
-
// Static Functions
Language *ObjCLanguage::CreateInstance(lldb::LanguageType language) {
@@ -932,7 +926,8 @@ lldb::TypeCategoryImplSP ObjCLanguage::GetFormatters() {
static TypeCategoryImplSP g_category;
llvm::call_once(g_initialize, [this]() -> void {
- DataVisualization::Categories::GetCategory(GetPluginName(), g_category);
+ DataVisualization::Categories::GetCategory(ConstString(GetPluginName()),
+ g_category);
if (g_category) {
LoadCoreMediaFormatters(g_category);
LoadObjCFormatters(g_category);
diff --git a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.h b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.h
index ea43ba57c0506..bc35cbe1ebcc1 100644
--- a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.h
+++ b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.h
@@ -156,7 +156,9 @@ class ObjCLanguage : public Language {
}
// PluginInterface protocol
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
};
} // namespace lldb_private
diff --git a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp
index 614efbd8d4579..2aa49add70eff 100644
--- a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp
+++ b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp
@@ -39,11 +39,6 @@ lldb_private::ConstString ObjCPlusPlusLanguage::GetPluginNameStatic() {
return g_name;
}
-// PluginInterface protocol
-lldb_private::ConstString ObjCPlusPlusLanguage::GetPluginName() {
- return GetPluginNameStatic();
-}
-
// 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 63b3521a72e11..9d093723b0a17 100644
--- a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h
+++ b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h
@@ -43,7 +43,9 @@ class ObjCPlusPlusLanguage : public Language {
static lldb_private::ConstString GetPluginNameStatic();
// PluginInterface protocol
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
};
} // namespace lldb_private
diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
index 014fef3cf3420..d6048fbf7cbf4 100644
--- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
@@ -410,11 +410,6 @@ lldb_private::ConstString ItaniumABILanguageRuntime::GetPluginNameStatic() {
return g_name;
}
-// PluginInterface protocol
-lldb_private::ConstString ItaniumABILanguageRuntime::GetPluginName() {
- return GetPluginNameStatic();
-}
-
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 988022d7e8a18..7b37cf8658e77 100644
--- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
+++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
@@ -76,7 +76,9 @@ class ItaniumABILanguageRuntime : public lldb_private::CPPLanguageRuntime {
lldb::ThreadSP thread_sp) override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
lldb::BreakpointResolverSP
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
index 05e75186343a5..1fb872ff89e16 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
@@ -97,11 +97,6 @@ lldb_private::ConstString AppleObjCRuntimeV1::GetPluginNameStatic() {
return g_name;
}
-// PluginInterface protocol
-ConstString AppleObjCRuntimeV1::GetPluginName() {
- return GetPluginNameStatic();
-}
-
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 9ccf3dab9eca5..26449b5b22841 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h
@@ -107,7 +107,9 @@ class AppleObjCRuntimeV1 : public AppleObjCRuntime {
CreateObjectChecker(std::string, ExecutionContext &exe_ctx) override;
// PluginInterface protocol
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 57de1faa1ca20..eaab24c3bf682 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
@@ -1066,11 +1066,6 @@ lldb_private::ConstString AppleObjCRuntimeV2::GetPluginNameStatic() {
return g_name;
}
-// PluginInterface protocol
-lldb_private::ConstString AppleObjCRuntimeV2::GetPluginName() {
- return GetPluginNameStatic();
-}
-
BreakpointResolverSP
AppleObjCRuntimeV2::CreateExceptionResolver(const BreakpointSP &bkpt,
bool catch_bp, bool throw_bp) {
@@ -2302,13 +2297,9 @@ static bool DoesProcessHaveSharedCache(Process &process) {
if (!platform_sp)
return true; // this should not happen
- ConstString platform_plugin_name = platform_sp->GetPluginName();
- if (platform_plugin_name) {
- llvm::StringRef platform_plugin_name_sr =
- platform_plugin_name.GetStringRef();
- if (platform_plugin_name_sr.endswith("-simulator"))
- return false;
- }
+ llvm::StringRef platform_plugin_name_sr = platform_sp->GetPluginName();
+ if (platform_plugin_name_sr.endswith("-simulator"))
+ return false;
return true;
}
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
index e57519bc193c4..8ea4cf9b48af5 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
@@ -54,7 +54,9 @@ class AppleObjCRuntimeV2 : public AppleObjCRuntime {
llvm::Expected<std::unique_ptr<UtilityFunction>>
CreateObjectChecker(std::string name, ExecutionContext &exe_ctx) override;
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 ba52b8dac0752..517d160e4d274 100644
--- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
@@ -1013,11 +1013,6 @@ void RenderScriptRuntime::ModulesDidLoad(const ModuleList &module_list) {
}
}
-// PluginInterface protocol
-lldb_private::ConstString RenderScriptRuntime::GetPluginName() {
- return GetPluginNameStatic();
-}
-
bool RenderScriptRuntime::GetDynamicTypeAndAddress(
ValueObject &in_value, lldb::DynamicValueType use_dynamic,
TypeAndOrName &class_type_or_name, Address &address,
diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
index f982e186e42d0..66553fddc4ec0 100644
--- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
+++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
@@ -410,7 +410,9 @@ class RenderScriptRuntime : public lldb_private::CPPLanguageRuntime {
bool GetOverrideExprOptions(clang::TargetOptions &prototype);
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
static bool GetKernelCoordinate(lldb_renderscript::RSCoordinate &coord,
Thread *thread_ptr);
diff --git a/lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.h b/lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.h
index ebce4afe488df..cdeba885084e2 100644
--- a/lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.h
+++ b/lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.h
@@ -29,8 +29,8 @@ class MemoryHistoryASan : public lldb_private::MemoryHistory {
static lldb_private::ConstString GetPluginNameStatic();
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
lldb_private::HistoryThreads GetHistoryThreads(lldb::addr_t address) override;
diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
index ea530894f35f0..529f3840be87c 100644
--- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
+++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
@@ -433,11 +433,6 @@ ObjectFileSP ObjectContainerBSDArchive::GetObjectFile(const FileSpec *file) {
return ObjectFileSP();
}
-// PluginInterface protocol
-lldb_private::ConstString ObjectContainerBSDArchive::GetPluginName() {
- return GetPluginNameStatic();
-}
-
size_t ObjectContainerBSDArchive::GetModuleSpecifications(
const lldb_private::FileSpec &file, lldb::DataBufferSP &data_sp,
lldb::offset_t data_offset, lldb::offset_t file_offset,
diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
index 9d1a0c2054de4..33b26b0930b57 100644
--- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
+++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
@@ -68,7 +68,9 @@ class ObjectContainerBSDArchive : public lldb_private::ObjectContainer {
lldb::ObjectFileSP GetObjectFile(const lldb_private::FileSpec *file) override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
struct Object {
diff --git a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
index 4440bccdeca9d..1184c02492691 100644
--- a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
+++ b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
@@ -205,11 +205,6 @@ ObjectContainerUniversalMachO::GetObjectFile(const FileSpec *file) {
return ObjectFileSP();
}
-// PluginInterface protocol
-lldb_private::ConstString ObjectContainerUniversalMachO::GetPluginName() {
- return GetPluginNameStatic();
-}
-
size_t ObjectContainerUniversalMachO::GetModuleSpecifications(
const lldb_private::FileSpec &file, lldb::DataBufferSP &data_sp,
lldb::offset_t data_offset, lldb::offset_t file_offset,
diff --git a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h
index 128bf6246b96c..5946c95ac5962 100644
--- a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h
+++ b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h
@@ -59,7 +59,9 @@ class ObjectContainerUniversalMachO : public lldb_private::ObjectContainer {
lldb::ObjectFileSP GetObjectFile(const lldb_private::FileSpec *file) override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
llvm::MachO::fat_header m_header;
diff --git a/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h b/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h
index 8f2091f262cb3..8181e93085636 100644
--- a/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h
+++ b/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h
@@ -44,7 +44,9 @@ class ObjectFileBreakpad : public ObjectFile {
ModuleSpecList &specs);
// PluginInterface protocol
- ConstString GetPluginName() override { return GetPluginNameStatic(); }
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
// LLVM RTTI support
static char ID;
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
index 8428978163270..f7e444138ef64 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -633,11 +633,6 @@ size_t ObjectFileELF::GetModuleSpecifications(
return specs.GetSize() - initial_count;
}
-// PluginInterface protocol
-lldb_private::ConstString ObjectFileELF::GetPluginName() {
- return GetPluginNameStatic();
-}
-
// ObjectFile protocol
ObjectFileELF::ObjectFileELF(const lldb::ModuleSP &module_sp,
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
index 9afb869666072..ff2bc5a07a5c9 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
@@ -85,7 +85,9 @@ class ObjectFileELF : public lldb_private::ObjectFile {
lldb::addr_t length);
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
// LLVM RTTI support
static char ID;
diff --git a/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp b/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp
index dcac63da21503..e19bd77c94e3e 100644
--- a/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp
+++ b/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.cpp
@@ -199,11 +199,6 @@ ArchSpec ObjectFileJIT::GetArchitecture() {
return ArchSpec();
}
-// PluginInterface protocol
-lldb_private::ConstString ObjectFileJIT::GetPluginName() {
- return GetPluginNameStatic();
-}
-
bool ObjectFileJIT::SetLoadAddress(Target &target, lldb::addr_t value,
bool value_is_offset) {
size_t num_loaded_sections = 0;
diff --git a/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.h b/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.h
index f617788a4c92a..c786adb56a15a 100644
--- a/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.h
+++ b/lldb/source/Plugins/ObjectFile/JIT/ObjectFileJIT.h
@@ -96,7 +96,9 @@ class ObjectFileJIT : public lldb_private::ObjectFile {
ObjectFile::Strata CalculateStrata() override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
lldb::ObjectFileJITDelegateWP m_delegate_wp;
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
index b3892b016c2e1..05132de6b3e7b 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -6191,11 +6191,6 @@ bool ObjectFileMachO::AllowAssemblyEmulationUnwindPlans() {
return m_allow_assembly_emulation_unwind_plans;
}
-// PluginInterface protocol
-lldb_private::ConstString ObjectFileMachO::GetPluginName() {
- return GetPluginNameStatic();
-}
-
Section *ObjectFileMachO::GetMachHeaderSection() {
// Find the first address of the mach header which is the first non-zero file
// sized section whose file offset is zero. This is the base file address of
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h
index 8fd57373ebfc1..b3e1d981cbec6 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h
@@ -146,7 +146,9 @@ class ObjectFileMachO : public lldb_private::ObjectFile {
bool AllowAssemblyEmulationUnwindPlans() override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
static lldb_private::UUID
diff --git a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.h b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.h
index b7349e5395f8b..6c68b481c8e4e 100644
--- a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.h
+++ b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.h
@@ -35,8 +35,8 @@ class ObjectFileMinidump : public lldb_private::PluginInterface {
}
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
static lldb_private::ObjectFile *
diff --git a/lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.h b/lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.h
index 578d64c5fe392..b9a3753789a9d 100644
--- a/lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.h
+++ b/lldb/source/Plugins/ObjectFile/PDB/ObjectFilePDB.h
@@ -48,7 +48,9 @@ class ObjectFilePDB : public ObjectFile {
ModuleSpecList &specs);
// PluginInterface protocol
- ConstString GetPluginName() override { return GetPluginNameStatic(); }
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
// LLVM RTTI support
static char ID;
diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
index fdc2b7bc9e706..d70b4eb120d04 100644
--- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
@@ -1205,6 +1205,3 @@ ObjectFile::Type ObjectFilePECOFF::CalculateType() {
}
ObjectFile::Strata ObjectFilePECOFF::CalculateStrata() { return eStrataUser; }
-
-// PluginInterface protocol
-ConstString ObjectFilePECOFF::GetPluginName() { return GetPluginNameStatic(); }
diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
index 1b66d3f7a64a7..aa3c523185487 100644
--- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
@@ -130,7 +130,9 @@ class ObjectFilePECOFF : public lldb_private::ObjectFile {
ObjectFile::Strata CalculateStrata() override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
bool IsWindowsSubsystem();
diff --git a/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.h b/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.h
index 48cf3130c8be8..d42085856d71e 100644
--- a/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.h
+++ b/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.h
@@ -48,7 +48,9 @@ class ObjectFileWasm : public ObjectFile {
/// PluginInterface protocol.
/// \{
- ConstString GetPluginName() override { return GetPluginNameStatic(); }
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
/// \}
/// LLVM RTTI support
diff --git a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
index 40cf1d9816789..570c9aaf52ecb 100644
--- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
+++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
@@ -140,11 +140,6 @@ DynamicRegisterInfo *OperatingSystemPython::GetDynamicRegisterInfo() {
return m_register_info_up.get();
}
-// PluginInterface protocol
-ConstString OperatingSystemPython::GetPluginName() {
- return GetPluginNameStatic();
-}
-
bool OperatingSystemPython::UpdateThreadList(ThreadList &old_thread_list,
ThreadList &core_thread_list,
ThreadList &new_thread_list) {
diff --git a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h
index 743fb545e3403..e343285ce7882 100644
--- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h
+++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h
@@ -41,7 +41,9 @@ class OperatingSystemPython : public lldb_private::OperatingSystem {
static const char *GetPluginDescriptionStatic();
// lldb_private::PluginInterface Methods
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
// lldb_private::OperatingSystem Methods
bool UpdateThreadList(lldb_private::ThreadList &old_thread_list,
diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
index f4642ba2c30bb..1e66b86e26615 100644
--- a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
+++ b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
@@ -146,17 +146,11 @@ const char *PlatformAndroid::GetPluginDescriptionStatic(bool is_host) {
return "Remote Android user platform plug-in.";
}
-ConstString PlatformAndroid::GetPluginName() {
- return GetPluginNameStatic(IsHost());
-}
-
Status PlatformAndroid::ConnectRemote(Args &args) {
m_device_id.clear();
- if (IsHost()) {
- return Status("can't connect to the host platform '%s', always connected",
- GetPluginName().GetCString());
- }
+ if (IsHost())
+ return Status("can't connect to the host platform, always connected");
if (!m_remote_platform_sp)
m_remote_platform_sp = PlatformSP(new PlatformAndroidRemoteGDBServer());
diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroid.h b/lldb/source/Plugins/Platform/Android/PlatformAndroid.h
index 913a60956b201..dd1f0c0427d7f 100644
--- a/lldb/source/Plugins/Platform/Android/PlatformAndroid.h
+++ b/lldb/source/Plugins/Platform/Android/PlatformAndroid.h
@@ -34,7 +34,9 @@ class PlatformAndroid : public platform_linux::PlatformLinux {
static const char *GetPluginDescriptionStatic(bool is_host);
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic(IsHost()).GetStringRef();
+ }
// lldb_private::Platform functions
diff --git a/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp b/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
index 7b3d8a375bf6b..d44a9108bb528 100644
--- a/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
+++ b/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
@@ -93,10 +93,6 @@ const char *PlatformFreeBSD::GetPluginDescriptionStatic(bool is_host) {
return "Remote FreeBSD user platform plug-in.";
}
-ConstString PlatformFreeBSD::GetPluginName() {
- return GetPluginNameStatic(IsHost());
-}
-
void PlatformFreeBSD::Initialize() {
Platform::Initialize();
diff --git a/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h b/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h
index a8d752966ceb6..16a28dacd26fa 100644
--- a/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h
+++ b/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h
@@ -29,7 +29,9 @@ class PlatformFreeBSD : public PlatformPOSIX {
static const char *GetPluginDescriptionStatic(bool is_host);
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic(IsHost()).GetStringRef();
+ }
// lldb_private::Platform functions
const char *GetDescription() override {
diff --git a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
index 314730c562f67..34a7df9cf0357 100644
--- a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
+++ b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
@@ -89,10 +89,6 @@ const char *PlatformLinux::GetPluginDescriptionStatic(bool is_host) {
return "Remote Linux user platform plug-in.";
}
-ConstString PlatformLinux::GetPluginName() {
- return GetPluginNameStatic(IsHost());
-}
-
void PlatformLinux::Initialize() {
PlatformPOSIX::Initialize();
diff --git a/lldb/source/Plugins/Platform/Linux/PlatformLinux.h b/lldb/source/Plugins/Platform/Linux/PlatformLinux.h
index f343b24921c99..71f54105be884 100644
--- a/lldb/source/Plugins/Platform/Linux/PlatformLinux.h
+++ b/lldb/source/Plugins/Platform/Linux/PlatformLinux.h
@@ -29,7 +29,9 @@ class PlatformLinux : public PlatformPOSIX {
static const char *GetPluginDescriptionStatic(bool is_host);
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic(IsHost()).GetStringRef();
+ }
// lldb_private::Platform functions
const char *GetDescription() override {
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp
index 0919ba23e3713..c9c275caaeba3 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp
@@ -406,10 +406,10 @@ Status PlatformAppleSimulator::ResolveExecutable(
if (error.Fail() || !exe_module_sp) {
if (FileSystem::Instance().Readable(resolved_module_spec.GetFileSpec())) {
- error.SetErrorStringWithFormat(
- "'%s' doesn't contain any '%s' platform architectures: %s",
- resolved_module_spec.GetFileSpec().GetPath().c_str(),
- GetPluginName().GetCString(), arch_names.GetString().str().c_str());
+ error.SetErrorStringWithFormatv(
+ "'{0}' doesn't contain any '{1}' platform architectures: {2}",
+ resolved_module_spec.GetFileSpec(), GetPluginName(),
+ arch_names.GetString());
} else {
error.SetErrorStringWithFormat(
"'%s' is not readable",
@@ -448,9 +448,9 @@ Status PlatformAppleSimulator::GetSymbolFile(const FileSpec &platform_file,
if (FileSystem::Instance().Exists(local_file))
return error;
}
- error.SetErrorStringWithFormat(
- "unable to locate a platform file for '%s' in platform '%s'",
- platform_file_path, GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "unable to locate a platform file for '{0}' in platform '{1}'",
+ platform_file_path, GetPluginName());
} else {
error.SetErrorString("invalid platform file argument");
}
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.h b/lldb/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.h
index fc428ad2be46a..cdc3bed2c0bf3 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.h
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.h
@@ -46,7 +46,9 @@ class PlatformAppleSimulator : public PlatformDarwin {
virtual ~PlatformAppleSimulator();
- lldb_private::ConstString GetPluginName() override { return m_plugin_name; }
+ llvm::StringRef GetPluginName() override {
+ return m_plugin_name.GetStringRef();
+ }
const char *GetDescription() override { return m_description; }
lldb_private::Status
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
index 943b157c69639..88ee1618454f6 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
@@ -1619,7 +1619,7 @@ ConstString PlatformDarwin::GetFullNameForDylib(ConstString basename) {
}
llvm::VersionTuple PlatformDarwin::GetOSVersion(Process *process) {
- if (process && strstr(GetPluginName().GetCString(), "-simulator")) {
+ if (process && GetPluginName().contains("-simulator")) {
lldb_private::ProcessInstanceInfo proc_info;
if (Host::GetProcessInfo(process->GetID(), proc_info)) {
const Environment &env = proc_info.GetEnvironment();
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h
index a7a325d2dcf49..60b7945dae9c7 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h
@@ -42,8 +42,8 @@ class PlatformDarwinKernel : public PlatformDarwin {
virtual ~PlatformDarwinKernel();
// lldb_private::PluginInterface functions
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
// lldb_private::Platform functions
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.h b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.h
index d16c25fd0aa83..5201c5605945f 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.h
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.h
@@ -28,8 +28,8 @@ class PlatformMacOSX : public PlatformDarwin {
static const char *GetDescriptionStatic();
// lldb_private::PluginInterface functions
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
lldb_private::Status
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleBridge.h b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleBridge.h
index 9da8bee3e20ad..96546c6238ce8 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleBridge.h
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleBridge.h
@@ -34,8 +34,8 @@ class PlatformRemoteAppleBridge : public PlatformRemoteDarwinDevice {
static const char *GetDescriptionStatic();
// lldb_private::PluginInterface functions
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
// lldb_private::Platform functions
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleTV.h b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleTV.h
index d69590c902a45..84c42a2f4917d 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleTV.h
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleTV.h
@@ -34,8 +34,8 @@ class PlatformRemoteAppleTV : public PlatformRemoteDarwinDevice {
static const char *GetDescriptionStatic();
// lldb_private::PluginInterface functions
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
// lldb_private::Platform functions
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.h b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.h
index 43c1e0803ab39..d0eebc6761119 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.h
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.h
@@ -39,8 +39,8 @@ class PlatformRemoteAppleWatch : public PlatformRemoteDarwinDevice {
const char *GetDescription() override { return GetDescriptionStatic(); }
// lldb_private::PluginInterface functions
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
// lldb_private::Platform functions
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteDarwinDevice.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteDarwinDevice.cpp
index 79cbd1c1f91aa..236eacebf7148 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteDarwinDevice.cpp
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteDarwinDevice.cpp
@@ -111,10 +111,10 @@ Status PlatformRemoteDarwinDevice::ResolveExecutable(
if (error.Fail() || !exe_module_sp) {
if (FileSystem::Instance().Readable(resolved_module_spec.GetFileSpec())) {
- error.SetErrorStringWithFormat(
- "'%s' doesn't contain any '%s' platform architectures: %s",
- resolved_module_spec.GetFileSpec().GetPath().c_str(),
- GetPluginName().GetCString(), arch_names.GetData());
+ error.SetErrorStringWithFormatv(
+ "'{0}' doesn't contain any '{1}' platform architectures: {2}",
+ resolved_module_spec.GetFileSpec(), GetPluginName(),
+ arch_names.GetData());
} else {
error.SetErrorStringWithFormat(
"'%s' is not readable",
@@ -486,9 +486,9 @@ Status PlatformRemoteDarwinDevice::GetSymbolFile(const FileSpec &platform_file,
if (FileSystem::Instance().Exists(local_file))
return error;
- error.SetErrorStringWithFormat(
- "unable to locate a platform file for '%s' in platform '%s'",
- platform_file_path, GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "unable to locate a platform file for '{0}' in platform '{1}'",
+ platform_file_path, GetPluginName());
} else {
error.SetErrorString("invalid platform file argument");
}
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteMacOSX.h b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteMacOSX.h
index 6b9880d5460d1..290a1957be9db 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteMacOSX.h
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteMacOSX.h
@@ -33,8 +33,8 @@ class PlatformRemoteMacOSX : public virtual PlatformRemoteDarwinDevice {
static const char *GetDescriptionStatic();
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
const char *GetDescription() override { return GetDescriptionStatic(); }
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
index d3a8302ffc326..6b78768e80fb3 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
@@ -37,8 +37,8 @@ class PlatformRemoteiOS : public PlatformRemoteDarwinDevice {
const char *GetDescription() override { return GetDescriptionStatic(); }
// lldb_private::PluginInterface functions
- lldb_private::ConstString GetPluginName() override {
- return GetPluginNameStatic();
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
}
bool GetSupportedArchitectureAtIndex(uint32_t idx,
diff --git a/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp b/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
index e3682b44e1414..a6972ff37c9a5 100644
--- a/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
+++ b/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
@@ -82,10 +82,6 @@ const char *PlatformNetBSD::GetPluginDescriptionStatic(bool is_host) {
return "Remote NetBSD user platform plug-in.";
}
-ConstString PlatformNetBSD::GetPluginName() {
- return GetPluginNameStatic(IsHost());
-}
-
void PlatformNetBSD::Initialize() {
PlatformPOSIX::Initialize();
diff --git a/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.h b/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.h
index 82fddd2ee411e..b25f5dcb967fc 100644
--- a/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.h
+++ b/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.h
@@ -29,7 +29,9 @@ class PlatformNetBSD : public PlatformPOSIX {
static const char *GetPluginDescriptionStatic(bool is_host);
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic(IsHost()).GetStringRef();
+ }
// lldb_private::Platform functions
const char *GetDescription() override {
diff --git a/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp b/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp
index 012b688231a03..b5bb2ea9ef68a 100644
--- a/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp
+++ b/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp
@@ -88,10 +88,6 @@ const char *PlatformOpenBSD::GetPluginDescriptionStatic(bool is_host) {
return "Remote OpenBSD user platform plug-in.";
}
-ConstString PlatformOpenBSD::GetPluginName() {
- return GetPluginNameStatic(IsHost());
-}
-
void PlatformOpenBSD::Initialize() {
Platform::Initialize();
diff --git a/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.h b/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.h
index 0ac5552566611..8da2d7506666e 100644
--- a/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.h
+++ b/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.h
@@ -29,7 +29,9 @@ class PlatformOpenBSD : public PlatformPOSIX {
static const char *GetPluginDescriptionStatic(bool is_host);
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic(IsHost()).GetStringRef();
+ }
// lldb_private::Platform functions
const char *GetDescription() override {
diff --git a/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp b/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
index 4a93e58598ef2..719109c863e7a 100644
--- a/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
+++ b/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
@@ -300,9 +300,9 @@ const lldb::UnixSignalsSP &PlatformPOSIX::GetRemoteUnixSignals() {
Status PlatformPOSIX::ConnectRemote(Args &args) {
Status error;
if (IsHost()) {
- error.SetErrorStringWithFormat(
- "can't connect to the host platform '%s', always connected",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "can't connect to the host platform '{0}', always connected",
+ GetPluginName());
} else {
if (!m_remote_platform_sp)
m_remote_platform_sp =
@@ -344,9 +344,9 @@ Status PlatformPOSIX::DisconnectRemote() {
Status error;
if (IsHost()) {
- error.SetErrorStringWithFormat(
- "can't disconnect from the host platform '%s', always connected",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "can't disconnect from the host platform '{0}', always connected",
+ GetPluginName());
} else {
if (m_remote_platform_sp)
error = m_remote_platform_sp->DisconnectRemote();
diff --git a/lldb/source/Plugins/Platform/Windows/PlatformWindows.cpp b/lldb/source/Plugins/Platform/Windows/PlatformWindows.cpp
index 69fa94c12d93a..eaa381d22c639 100644
--- a/lldb/source/Plugins/Platform/Windows/PlatformWindows.cpp
+++ b/lldb/source/Plugins/Platform/Windows/PlatformWindows.cpp
@@ -117,10 +117,6 @@ const char *PlatformWindows::GetPluginDescriptionStatic(bool is_host) {
: "Remote Windows user platform plug-in.";
}
-lldb_private::ConstString PlatformWindows::GetPluginName() {
- return GetPluginNameStatic(IsHost());
-}
-
void PlatformWindows::Initialize() {
Platform::Initialize();
@@ -154,9 +150,9 @@ PlatformWindows::PlatformWindows(bool is_host) : RemoteAwarePlatform(is_host) {}
Status PlatformWindows::ConnectRemote(Args &args) {
Status error;
if (IsHost()) {
- error.SetErrorStringWithFormat(
- "can't connect to the host platform '%s', always connected",
- GetPluginName().AsCString());
+ error.SetErrorStringWithFormatv(
+ "can't connect to the host platform '{0}', always connected",
+ GetPluginName());
} else {
if (!m_remote_platform_sp)
m_remote_platform_sp =
@@ -185,9 +181,9 @@ Status PlatformWindows::DisconnectRemote() {
Status error;
if (IsHost()) {
- error.SetErrorStringWithFormat(
- "can't disconnect from the host platform '%s', always connected",
- GetPluginName().AsCString());
+ error.SetErrorStringWithFormatv(
+ "can't disconnect from the host platform '{0}', always connected",
+ GetPluginName());
} else {
if (m_remote_platform_sp)
error = m_remote_platform_sp->DisconnectRemote();
diff --git a/lldb/source/Plugins/Platform/Windows/PlatformWindows.h b/lldb/source/Plugins/Platform/Windows/PlatformWindows.h
index 9bff68f163197..2a0247d8c895e 100644
--- a/lldb/source/Plugins/Platform/Windows/PlatformWindows.h
+++ b/lldb/source/Plugins/Platform/Windows/PlatformWindows.h
@@ -29,7 +29,9 @@ class PlatformWindows : public RemoteAwarePlatform {
static const char *GetPluginDescriptionStatic(bool is_host);
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic(IsHost()).GetStringRef();
+ }
// lldb_private::Platform functions
const char *GetDescription() override {
diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
index 01a0ec5ccaa87..667618b26882f 100644
--- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
+++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
@@ -145,10 +145,10 @@ Status PlatformRemoteGDBServer::ResolveExecutable(
if (error.Fail() || !exe_module_sp) {
if (FileSystem::Instance().Readable(resolved_module_spec.GetFileSpec())) {
- error.SetErrorStringWithFormat(
- "'%s' doesn't contain any '%s' platform architectures: %s",
- resolved_module_spec.GetFileSpec().GetPath().c_str(),
- GetPluginName().GetCString(), arch_names.GetData());
+ error.SetErrorStringWithFormatv(
+ "'{0}' doesn't contain any '{1}' platform architectures: {2}",
+ resolved_module_spec.GetFileSpec(), GetPluginName(),
+ arch_names.GetData());
} else {
error.SetErrorStringWithFormat(
"'%s' is not readable",
diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
index 4f0e3c2100d2b..0c8584a7388c6 100644
--- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
+++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
@@ -37,7 +37,9 @@ class PlatformRemoteGDBServer : public Platform, private UserIDResolver {
~PlatformRemoteGDBServer() override;
// lldb_private::PluginInterface functions
- ConstString GetPluginName() override { return GetPluginNameStatic(); }
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
// lldb_private::Platform functions
Status
diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
index 749d7446b6464..088a2aed3ce7b 100644
--- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
+++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
@@ -172,11 +172,6 @@ ProcessKDP::~ProcessKDP() {
Finalize();
}
-// PluginInterface
-lldb_private::ConstString ProcessKDP::GetPluginName() {
- return GetPluginNameStatic();
-}
-
Status ProcessKDP::WillLaunch(Module *module) {
Status error;
error.SetErrorString("launching not supported in kdp-remote plug-in");
diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h
index 35c5f57179d90..4373141589784 100644
--- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h
+++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h
@@ -85,7 +85,9 @@ class ProcessKDP : public lldb_private::Process {
lldb_private::DynamicLoader *GetDynamicLoader() override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
// Process Control
lldb_private::Status WillResume() override;
diff --git a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
index 74efa35f962f4..0952e2da289e0 100644
--- a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
+++ b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
@@ -142,12 +142,6 @@ size_t ProcessWindows::PutSTDIN(const char *buf, size_t buf_size,
return 0;
}
-// ProcessInterface protocol.
-
-lldb_private::ConstString ProcessWindows::GetPluginName() {
- return GetPluginNameStatic();
-}
-
Status ProcessWindows::EnableBreakpointSite(BreakpointSite *bp_site) {
if (bp_site->HardwareRequired())
return Status("Hardware breakpoints are not supported.");
diff --git a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.h b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.h
index 3a48a6de1870c..5bd7056470ef9 100644
--- a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.h
+++ b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.h
@@ -45,8 +45,9 @@ class ProcessWindows : public Process, public ProcessDebugger {
size_t GetSTDERR(char *buf, size_t buf_size, Status &error) override;
size_t PutSTDIN(const char *buf, size_t buf_size, Status &error) override;
- // lldb_private::Process overrides
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
Status EnableBreakpointSite(BreakpointSite *bp_site) override;
Status DisableBreakpointSite(BreakpointSite *bp_site) override;
diff --git a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
index 5bbdc96f6f47e..f7ae421cc921a 100644
--- a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
+++ b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
@@ -110,9 +110,6 @@ ProcessElfCore::~ProcessElfCore() {
Finalize();
}
-// PluginInterface
-ConstString ProcessElfCore::GetPluginName() { return GetPluginNameStatic(); }
-
lldb::addr_t ProcessElfCore::AddAddressRangeFromLoadSegment(
const elf::ELFProgramHeader &header) {
const lldb::addr_t addr = header.p_vaddr;
diff --git a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h
index d2c0bf1c28687..3e70e9750f22c 100644
--- a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h
+++ b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.h
@@ -60,7 +60,9 @@ class ProcessElfCore : public lldb_private::PostMortemProcess {
lldb_private::DynamicLoader *GetDynamicLoader() override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
// Process Control
lldb_private::Status DoDestroy() override;
@@ -69,9 +71,8 @@ class ProcessElfCore : public lldb_private::PostMortemProcess {
lldb_private::Status WillResume() override {
lldb_private::Status error;
- error.SetErrorStringWithFormat(
- "error: %s does not support resuming processes",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support resuming processes", GetPluginName());
return error;
}
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index 1a5f4a2beea89..79a3941f4014b 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -324,9 +324,6 @@ ProcessGDBRemote::~ProcessGDBRemote() {
KillDebugserverProcess();
}
-// PluginInterface
-ConstString ProcessGDBRemote::GetPluginName() { return GetPluginNameStatic(); }
-
bool ProcessGDBRemote::ParsePythonTargetDefinition(
const FileSpec &target_definition_fspec) {
ScriptInterpreter *interpreter =
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
index ce74b34974aa0..071e0315770a8 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
@@ -103,7 +103,9 @@ class ProcessGDBRemote : public Process,
void DidAttach(ArchSpec &process_arch) override;
// PluginInterface protocol
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
// Process Control
Status WillResume() override;
diff --git a/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp b/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp
index 946f8def7c159..71197fbc37466 100644
--- a/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp
+++ b/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp
@@ -128,9 +128,6 @@ ProcessMachCore::~ProcessMachCore() {
Finalize();
}
-// PluginInterface
-ConstString ProcessMachCore::GetPluginName() { return GetPluginNameStatic(); }
-
bool ProcessMachCore::GetDynamicLoaderAddress(lldb::addr_t addr) {
Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER |
LIBLLDB_LOG_PROCESS));
diff --git a/lldb/source/Plugins/Process/mach-core/ProcessMachCore.h b/lldb/source/Plugins/Process/mach-core/ProcessMachCore.h
index 1eec2e4aa3c79..72f7ae3de0e4f 100644
--- a/lldb/source/Plugins/Process/mach-core/ProcessMachCore.h
+++ b/lldb/source/Plugins/Process/mach-core/ProcessMachCore.h
@@ -49,7 +49,9 @@ class ProcessMachCore : public lldb_private::PostMortemProcess {
lldb_private::DynamicLoader *GetDynamicLoader() override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
// Process Control
lldb_private::Status DoDestroy() override;
diff --git a/lldb/source/Plugins/Process/minidump/ProcessMinidump.cpp b/lldb/source/Plugins/Process/minidump/ProcessMinidump.cpp
index 0793fc2713af1..c9e1350283d05 100644
--- a/lldb/source/Plugins/Process/minidump/ProcessMinidump.cpp
+++ b/lldb/source/Plugins/Process/minidump/ProcessMinidump.cpp
@@ -63,7 +63,9 @@ class PlaceholderObjectFile : public ObjectFile {
static ConstString GetStaticPluginName() {
return ConstString("placeholder");
}
- ConstString GetPluginName() override { return GetStaticPluginName(); }
+ llvm::StringRef GetPluginName() override {
+ return GetStaticPluginName().GetStringRef();
+ }
bool ParseHeader() override { return true; }
Type CalculateType() override { return eTypeUnknown; }
Strata CalculateStrata() override { return eStrataUnknown; }
@@ -304,8 +306,6 @@ Status ProcessMinidump::DoLoadCore() {
return error;
}
-ConstString ProcessMinidump::GetPluginName() { return GetPluginNameStatic(); }
-
Status ProcessMinidump::DoDestroy() { return Status(); }
void ProcessMinidump::RefreshStateAfterStop() {
@@ -581,8 +581,9 @@ void ProcessMinidump::ReadModuleList() {
// we don't then we will end up setting the load address of a
diff erent
// PlaceholderObjectFile and an assertion will fire.
auto *objfile = module_sp->GetObjectFile();
- if (objfile && objfile->GetPluginName() ==
- PlaceholderObjectFile::GetStaticPluginName()) {
+ if (objfile &&
+ objfile->GetPluginName() ==
+ PlaceholderObjectFile::GetStaticPluginName().GetStringRef()) {
if (((PlaceholderObjectFile *)objfile)->GetBaseImageAddress() !=
load_addr)
module_sp.reset();
diff --git a/lldb/source/Plugins/Process/minidump/ProcessMinidump.h b/lldb/source/Plugins/Process/minidump/ProcessMinidump.h
index d748c9d7e3329..99d4b3e6081cf 100644
--- a/lldb/source/Plugins/Process/minidump/ProcessMinidump.h
+++ b/lldb/source/Plugins/Process/minidump/ProcessMinidump.h
@@ -55,7 +55,9 @@ class ProcessMinidump : public PostMortemProcess {
DynamicLoader *GetDynamicLoader() override { return nullptr; }
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
SystemRuntime *GetSystemRuntime() override { return nullptr; }
@@ -85,9 +87,8 @@ class ProcessMinidump : public PostMortemProcess {
Status WillResume() override {
Status error;
- error.SetErrorStringWithFormat(
- "error: %s does not support resuming processes",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "error: {0} does not support resuming processes", GetPluginName());
return error;
}
diff --git a/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp b/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
index 58576251be14d..521512317b368 100644
--- a/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
+++ b/lldb/source/Plugins/Process/scripted/ScriptedProcess.cpp
@@ -145,8 +145,6 @@ void ScriptedProcess::Terminate() {
PluginManager::UnregisterPlugin(ScriptedProcess::CreateInstance);
}
-ConstString ScriptedProcess::GetPluginName() { return GetPluginNameStatic(); }
-
Status ScriptedProcess::DoLoadCore() {
ProcessLaunchInfo launch_info = GetTarget().GetProcessLaunchInfo();
diff --git a/lldb/source/Plugins/Process/scripted/ScriptedProcess.h b/lldb/source/Plugins/Process/scripted/ScriptedProcess.h
index e7a5147cb858f..c2ec371488ae1 100644
--- a/lldb/source/Plugins/Process/scripted/ScriptedProcess.h
+++ b/lldb/source/Plugins/Process/scripted/ScriptedProcess.h
@@ -63,7 +63,9 @@ class ScriptedProcess : public Process {
DynamicLoader *GetDynamicLoader() override { return nullptr; }
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
SystemRuntime *GetSystemRuntime() override { return nullptr; }
diff --git a/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp b/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp
index 47fb12b9d58de..24b36747cf229 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp
+++ b/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp
@@ -396,8 +396,4 @@ const char *ScriptInterpreterLua::GetPluginDescriptionStatic() {
return "Lua script interpreter";
}
-lldb_private::ConstString ScriptInterpreterLua::GetPluginName() {
- return GetPluginNameStatic();
-}
-
Lua &ScriptInterpreterLua::GetLua() { return *m_lua; }
diff --git a/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h b/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h
index 447fce5bb7f91..1cb0dcc7d3995 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h
@@ -70,7 +70,9 @@ class ScriptInterpreterLua : public ScriptInterpreter {
lldb::user_id_t watch_id);
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
Lua &GetLua();
diff --git a/lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp b/lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp
index 6d7bef6f918df..ace3ede38bd1d 100644
--- a/lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp
+++ b/lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp
@@ -65,7 +65,3 @@ lldb_private::ConstString ScriptInterpreterNone::GetPluginNameStatic() {
const char *ScriptInterpreterNone::GetPluginDescriptionStatic() {
return "Null script interpreter";
}
-
-lldb_private::ConstString ScriptInterpreterNone::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.h b/lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.h
index cbfa019fe4784..e16d525e78647 100644
--- a/lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.h
+++ b/lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.h
@@ -37,7 +37,9 @@ class ScriptInterpreterNone : public ScriptInterpreter {
static const char *GetPluginDescriptionStatic();
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
};
} // namespace lldb_private
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
index 67595069323c3..5b1ffbc9f346f 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
@@ -590,10 +590,6 @@ ScriptInterpreterPythonImpl::~ScriptInterpreterPythonImpl() {
PyGILState_Release(gil_state);
}
-lldb_private::ConstString ScriptInterpreterPythonImpl::GetPluginName() {
- return GetPluginNameStatic();
-}
-
void ScriptInterpreterPythonImpl::IOHandlerActivated(IOHandler &io_handler,
bool interactive) {
const char *instructions = nullptr;
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h
index b6926b61ca06a..443a65a2b3801 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h
@@ -292,7 +292,9 @@ class ScriptInterpreterPythonImpl : public ScriptInterpreterPython {
static lldb::ScriptInterpreterSP CreateInstance(Debugger &debugger);
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
class Locker : public ScriptInterpreterLocker {
public:
diff --git a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
index 5339c5bd702ee..0ee7660d714cb 100644
--- a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
+++ b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
@@ -800,8 +800,9 @@ class EnableCommand : public CommandObjectParsed {
// Get the plugin for the process.
auto plugin_sp =
process_sp->GetStructuredDataPlugin(GetDarwinLogTypeName());
- if (!plugin_sp || (plugin_sp->GetPluginName() !=
- StructuredDataDarwinLog::GetStaticPluginName())) {
+ if (!plugin_sp ||
+ (plugin_sp->GetPluginName() !=
+ StructuredDataDarwinLog::GetStaticPluginName().GetStringRef())) {
result.AppendError("failed to get StructuredDataPlugin for "
"the process");
}
@@ -1054,15 +1055,6 @@ ConstString StructuredDataDarwinLog::GetStaticPluginName() {
return s_plugin_name;
}
-#pragma mark -
-#pragma mark PluginInterface API
-
-// PluginInterface API
-
-ConstString StructuredDataDarwinLog::GetPluginName() {
- return GetStaticPluginName();
-}
-
#pragma mark -
#pragma mark StructuredDataPlugin API
diff --git a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.h b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.h
index 6625154ddce4f..f1be0637c6ab3 100644
--- a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.h
+++ b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.h
@@ -46,7 +46,9 @@ class StructuredDataDarwinLog : public StructuredDataPlugin {
// PluginInterface API
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetStaticPluginName().GetStringRef();
+ }
// StructuredDataPlugin API
diff --git a/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h b/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h
index b4faad52cd243..1013f6e8cf655 100644
--- a/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h
+++ b/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h
@@ -146,7 +146,9 @@ class SymbolFileBreakpad : public SymbolFile {
GetUnwindPlan(const Address &address,
const RegisterInfoResolver &resolver) override;
- ConstString GetPluginName() override { return GetPluginNameStatic(); }
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
private:
// A class representing a position in the breakpad file. Useful for
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index 6085027abcc46..81c730539604e 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -3833,9 +3833,6 @@ SymbolFileDWARF::ParseCallEdgesInFunction(UserID func_id) {
return {};
}
-// PluginInterface protocol
-ConstString SymbolFileDWARF::GetPluginName() { return GetPluginNameStatic(); }
-
void SymbolFileDWARF::Dump(lldb_private::Stream &s) {
SymbolFile::Dump(s);
m_index->Dump(s);
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
index d001742342bd7..e02ae1347e844 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
@@ -218,7 +218,9 @@ class SymbolFileDWARF : public lldb_private::SymbolFile,
std::recursive_mutex &GetModuleMutex() const override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
DWARFDebugAbbrev *DebugAbbrev();
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
index 64532139855ab..884260f2df1d5 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
@@ -528,8 +528,8 @@ SymbolFileDWARFDebugMap::GetSymbolFileByOSOIndex(uint32_t oso_idx) {
SymbolFileDWARF *
SymbolFileDWARFDebugMap::GetSymbolFileAsSymbolFileDWARF(SymbolFile *sym_file) {
- if (sym_file &&
- sym_file->GetPluginName() == SymbolFileDWARF::GetPluginNameStatic())
+ if (sym_file && sym_file->GetPluginName() ==
+ SymbolFileDWARF::GetPluginNameStatic().GetStringRef())
return static_cast<SymbolFileDWARF *>(sym_file);
return nullptr;
}
@@ -1234,11 +1234,6 @@ void SymbolFileDWARFDebugMap::DumpClangAST(Stream &s) {
});
}
-// PluginInterface protocol
-lldb_private::ConstString SymbolFileDWARFDebugMap::GetPluginName() {
- return GetPluginNameStatic();
-}
-
lldb::CompUnitSP
SymbolFileDWARFDebugMap::GetCompileUnit(SymbolFileDWARF *oso_dwarf) {
if (oso_dwarf) {
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
index bd6c4513befda..a55bb3a709529 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h
@@ -140,7 +140,9 @@ class SymbolFileDWARFDebugMap : public lldb_private::SymbolFile {
void DumpClangAST(lldb_private::Stream &s) override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
enum { kHaveInitializedOSOs = (1 << 0), kNumFlags };
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
index 6b8281e7fa1d8..8f0adaf32fa4e 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp
@@ -1566,8 +1566,3 @@ SymbolFileNativePDB::GetTypeSystemForLanguage(lldb::LanguageType language) {
}
return type_system_or_err;
}
-
-ConstString SymbolFileNativePDB::GetPluginName() {
- static ConstString g_name("pdb");
- return g_name;
-}
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h
index 3636b97838b73..acbf05fe46ea0 100644
--- a/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h
+++ b/lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h
@@ -151,7 +151,9 @@ class SymbolFileNativePDB : public SymbolFile {
FindNamespace(ConstString name,
const CompilerDeclContext &parent_decl_ctx) override;
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
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 be1c62c62006a..9c98ce76ba40e 100644
--- a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
+++ b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
@@ -1713,11 +1713,6 @@ SymbolFilePDB::FindNamespace(lldb_private::ConstString name,
return clang_type_system->CreateDeclContext(namespace_decl);
}
-lldb_private::ConstString SymbolFilePDB::GetPluginName() {
- static ConstString g_name("pdb");
- return g_name;
-}
-
IPDBSession &SymbolFilePDB::GetPDBSession() { return *m_session_up; }
const IPDBSession &SymbolFilePDB::GetPDBSession() const {
diff --git a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h
index 62ba8a29b5086..67e309fb9a963 100644
--- a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h
+++ b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.h
@@ -161,7 +161,9 @@ class SymbolFilePDB : public lldb_private::SymbolFile {
lldb_private::ConstString name,
const lldb_private::CompilerDeclContext &parent_decl_ctx) override;
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
llvm::pdb::IPDBSession &GetPDBSession();
diff --git a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp
index ce00d2edbf01b..e3358b290d77e 100644
--- a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp
+++ b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp
@@ -260,8 +260,3 @@ uint32_t SymbolFileSymtab::ResolveSymbolContext(const Address &so_addr,
}
return resolved_flags;
}
-
-// PluginInterface protocol
-lldb_private::ConstString SymbolFileSymtab::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h
index dff26bdf560ef..11475b0c66ece 100644
--- a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h
+++ b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h
@@ -85,7 +85,9 @@ class SymbolFileSymtab : public lldb_private::SymbolFile {
lldb_private::TypeList &type_list) override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
uint32_t CalculateNumCompileUnits() override;
diff --git a/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp b/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
index 8354a401900ec..a598bb0c6ccfe 100644
--- a/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
+++ b/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
@@ -144,6 +144,3 @@ SymbolVendorELF::CreateInstance(const lldb::ModuleSP &module_sp,
symbol_vendor->AddSymbolFileRepresentation(dsym_objfile_sp);
return symbol_vendor;
}
-
-// PluginInterface protocol
-ConstString SymbolVendorELF::GetPluginName() { return GetPluginNameStatic(); }
diff --git a/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.h b/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.h
index e264b2362ffd8..60b520322bd8b 100644
--- a/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.h
+++ b/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.h
@@ -31,7 +31,9 @@ class SymbolVendorELF : public lldb_private::SymbolVendor {
lldb_private::Stream *feedback_strm);
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
};
#endif // LLDB_SOURCE_PLUGINS_SYMBOLVENDOR_ELF_SYMBOLVENDORELF_H
diff --git a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
index 23acce8d4da34..c3fe34a63647d 100644
--- a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
+++ b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
@@ -310,8 +310,3 @@ SymbolVendorMacOSX::CreateInstance(const lldb::ModuleSP &module_sp,
}
return symbol_vendor;
}
-
-// PluginInterface protocol
-ConstString SymbolVendorMacOSX::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h
index 3a7fbfac9da4c..11312a8d0b593 100644
--- a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h
+++ b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h
@@ -31,7 +31,9 @@ class SymbolVendorMacOSX : public lldb_private::SymbolVendor {
SymbolVendorMacOSX(const lldb::ModuleSP &module_sp);
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
};
#endif // LLDB_SOURCE_PLUGINS_SYMBOLVENDOR_MACOSX_SYMBOLVENDORMACOSX_H
diff --git a/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp b/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp
index 41d7117a98d1a..6be717b6a65a9 100644
--- a/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp
+++ b/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp
@@ -139,6 +139,3 @@ SymbolVendorWasm::CreateInstance(const lldb::ModuleSP &module_sp,
symbol_vendor->AddSymbolFileRepresentation(sym_objfile_sp);
return symbol_vendor;
}
-
-// PluginInterface protocol
-ConstString SymbolVendorWasm::GetPluginName() { return GetPluginNameStatic(); }
diff --git a/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.h b/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.h
index 940492a079401..403bdb9d7feac 100644
--- a/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.h
+++ b/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.h
@@ -30,7 +30,9 @@ class SymbolVendorWasm : public lldb_private::SymbolVendor {
/// PluginInterface protocol.
/// \{
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
/// \}
};
diff --git a/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp b/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp
index aa81eb2a54ae8..262ec8767a802 100644
--- a/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp
+++ b/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp
@@ -992,8 +992,3 @@ lldb_private::ConstString SystemRuntimeMacOSX::GetPluginNameStatic() {
const char *SystemRuntimeMacOSX::GetPluginDescriptionStatic() {
return "System runtime plugin for Mac OS X native libraries.";
}
-
-// PluginInterface protocol
-lldb_private::ConstString SystemRuntimeMacOSX::GetPluginName() {
- return GetPluginNameStatic();
-}
diff --git a/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h b/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h
index 8e128b69a3ec4..1ac8569854b12 100644
--- a/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h
+++ b/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h
@@ -98,7 +98,9 @@ class SystemRuntimeMacOSX : public lldb_private::SystemRuntime {
bool SafeToCallFunctionsOnThisThread(lldb::ThreadSP thread_sp) override;
// PluginInterface protocol
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
protected:
lldb::user_id_t m_break_id;
diff --git a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp
index 26c94ffa15d8f..1b2a5b27905f4 100644
--- a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp
+++ b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp
@@ -58,12 +58,6 @@ StringRef TraceIntelPT::GetSchema() {
return TraceIntelPTSessionFileParser::GetSchema();
}
-//------------------------------------------------------------------
-// PluginInterface protocol
-//------------------------------------------------------------------
-
-ConstString TraceIntelPT::GetPluginName() { return GetPluginNameStatic(); }
-
void TraceIntelPT::Dump(Stream *s) const {}
llvm::Error TraceIntelPT::SaveLiveTraceToDisk(FileSpec directory) {
@@ -284,7 +278,7 @@ Error TraceIntelPT::Start(size_t thread_buffer_size,
request.processBufferSizeLimit = total_buffer_size_limit;
request.enableTsc = enable_tsc;
request.psbPeriod = psb_period.map([](size_t val) { return (int64_t)val; });
- request.type = GetPluginName().AsCString();
+ request.type = GetPluginName().str();
return Trace::Start(toJSON(request));
}
@@ -318,7 +312,7 @@ llvm::Error TraceIntelPT::Start(llvm::ArrayRef<lldb::tid_t> tids,
request.threadBufferSize = thread_buffer_size;
request.enableTsc = enable_tsc;
request.psbPeriod = psb_period.map([](size_t val) { return (int64_t)val; });
- request.type = GetPluginName().AsCString();
+ request.type = GetPluginName().str();
request.tids.emplace();
for (lldb::tid_t tid : tids)
request.tids->push_back(tid);
diff --git a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.h b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.h
index 851a04b6e909b..29629060e1c80 100644
--- a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.h
+++ b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.h
@@ -28,7 +28,9 @@ class TraceIntelPT : public Trace {
/// PluginInterface protocol
/// \{
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
static void Initialize();
diff --git a/lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.cpp b/lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.cpp
index 91d2fe8540f02..893a285284bb0 100644
--- a/lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.cpp
+++ b/lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.cpp
@@ -44,8 +44,6 @@ ConstString TraceExporterCTF::GetPluginNameStatic() {
return g_name;
}
-ConstString TraceExporterCTF::GetPluginName() { return GetPluginNameStatic(); }
-
Expected<TraceExporterUP> TraceExporterCTF::CreateInstance() {
return std::make_unique<TraceExporterCTF>();
}
diff --git a/lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.h b/lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.h
index 568568264f552..7ead18b0a9dee 100644
--- a/lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.h
+++ b/lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.h
@@ -10,6 +10,7 @@
#define LLDB_SOURCE_PLUGINS_TRACE_EXPORTER_CTF_H
#include "lldb/Target/TraceExporter.h"
+#include "lldb/Utility/ConstString.h"
namespace lldb_private {
namespace ctf {
@@ -24,7 +25,9 @@ class TraceExporterCTF : public TraceExporter {
/// \{
static llvm::Expected<lldb::TraceExporterUP> CreateInstance();
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
static void Initialize();
diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
index f49ca04c1f46f..6db0f5a5d2af5 100644
--- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -574,10 +574,6 @@ ConstString TypeSystemClang::GetPluginNameStatic() {
return ConstString("clang");
}
-ConstString TypeSystemClang::GetPluginName() {
- return TypeSystemClang::GetPluginNameStatic();
-}
-
lldb::TypeSystemSP TypeSystemClang::CreateInstance(lldb::LanguageType language,
lldb_private::Module *module,
Target *target) {
diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
index ec0335baf6a20..1c57440fda29c 100644
--- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
+++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
@@ -138,7 +138,9 @@ class TypeSystemClang : public TypeSystem {
void Finalize() override;
// PluginInterface functions
- ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
static ConstString GetPluginNameStatic();
diff --git a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
index bd96d3c1403e9..f489dd2370e0e 100644
--- a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
+++ b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
@@ -333,11 +333,6 @@ UnwindAssemblyInstEmulation::CreateInstance(const ArchSpec &arch) {
return nullptr;
}
-// PluginInterface protocol in UnwindAssemblyParser_x86
-ConstString UnwindAssemblyInstEmulation::GetPluginName() {
- return GetPluginNameStatic();
-}
-
void UnwindAssemblyInstEmulation::Initialize() {
PluginManager::RegisterPlugin(GetPluginNameStatic(),
GetPluginDescriptionStatic(), CreateInstance);
diff --git a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h
index 4e0f8a493316f..670be1b5e64e0 100644
--- a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h
+++ b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h
@@ -56,7 +56,9 @@ class UnwindAssemblyInstEmulation : public lldb_private::UnwindAssembly {
static const char *GetPluginDescriptionStatic();
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
private:
// Call CreateInstance to get an instance of this class
diff --git a/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp b/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
index 2ae67dbdc8fc0..f070008867d47 100644
--- a/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
+++ b/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
@@ -239,12 +239,6 @@ UnwindAssembly *UnwindAssembly_x86::CreateInstance(const ArchSpec &arch) {
return nullptr;
}
-// PluginInterface protocol in UnwindAssemblyParser_x86
-
-ConstString UnwindAssembly_x86::GetPluginName() {
- return GetPluginNameStatic();
-}
-
void UnwindAssembly_x86::Initialize() {
PluginManager::RegisterPlugin(GetPluginNameStatic(),
GetPluginDescriptionStatic(), CreateInstance);
diff --git a/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h b/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h
index 8bd8a7352504a..16c7cf76e9c29 100644
--- a/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h
+++ b/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h
@@ -50,7 +50,9 @@ class UnwindAssembly_x86 : public lldb_private::UnwindAssembly {
static const char *GetPluginDescriptionStatic();
- lldb_private::ConstString GetPluginName() override;
+ llvm::StringRef GetPluginName() override {
+ return GetPluginNameStatic().GetStringRef();
+ }
private:
UnwindAssembly_x86(const lldb_private::ArchSpec &arch);
diff --git a/lldb/source/Symbol/SymbolVendor.cpp b/lldb/source/Symbol/SymbolVendor.cpp
index f50ee6c8924b2..d26363130e2df 100644
--- a/lldb/source/Symbol/SymbolVendor.cpp
+++ b/lldb/source/Symbol/SymbolVendor.cpp
@@ -69,9 +69,3 @@ void SymbolVendor::AddSymbolFileRepresentation(const ObjectFileSP &objfile_sp) {
m_sym_file_up.reset(SymbolFile::FindPlugin(objfile_sp));
}
}
-
-// PluginInterface protocol
-lldb_private::ConstString SymbolVendor::GetPluginName() {
- static ConstString g_name("vendor-default");
- return g_name;
-}
diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp
index 07cbc119740a0..9c57689b419ea 100644
--- a/lldb/source/Target/Platform.cpp
+++ b/lldb/source/Target/Platform.cpp
@@ -399,7 +399,7 @@ Platform::~Platform() = default;
void Platform::GetStatus(Stream &strm) {
std::string s;
- strm.Printf(" Platform: %s\n", GetPluginName().GetCString());
+ strm.Format(" Platform: {0}\n", GetPluginName());
ArchSpec arch(GetSystemArchitecture());
if (arch.IsValid()) {
@@ -752,9 +752,8 @@ Status Platform::MakeDirectory(const FileSpec &file_spec,
return llvm::sys::fs::create_directory(file_spec.GetPath(), permissions);
else {
Status error;
- error.SetErrorStringWithFormat("remote platform %s doesn't support %s",
- GetPluginName().GetCString(),
- LLVM_PRETTY_FUNCTION);
+ error.SetErrorStringWithFormatv("remote platform {0} doesn't support {1}",
+ GetPluginName(), LLVM_PRETTY_FUNCTION);
return error;
}
}
@@ -768,9 +767,8 @@ Status Platform::GetFilePermissions(const FileSpec &file_spec,
return Status(Value.getError());
} else {
Status error;
- error.SetErrorStringWithFormat("remote platform %s doesn't support %s",
- GetPluginName().GetCString(),
- LLVM_PRETTY_FUNCTION);
+ error.SetErrorStringWithFormatv("remote platform {0} doesn't support {1}",
+ GetPluginName(), LLVM_PRETTY_FUNCTION);
return error;
}
}
@@ -782,14 +780,13 @@ Status Platform::SetFilePermissions(const FileSpec &file_spec,
return llvm::sys::fs::setPermissions(file_spec.GetPath(), Perms);
} else {
Status error;
- error.SetErrorStringWithFormat("remote platform %s doesn't support %s",
- GetPluginName().GetCString(),
- LLVM_PRETTY_FUNCTION);
+ error.SetErrorStringWithFormatv("remote platform {0} doesn't support {1}",
+ GetPluginName(), LLVM_PRETTY_FUNCTION);
return error;
}
}
-ConstString Platform::GetName() { return GetPluginName(); }
+ConstString Platform::GetName() { return ConstString(GetPluginName()); }
const char *Platform::GetHostname() {
if (IsHost())
@@ -949,26 +946,27 @@ ArchSpec Platform::GetAugmentedArchSpec(llvm::StringRef triple) {
Status Platform::ConnectRemote(Args &args) {
Status error;
if (IsHost())
- error.SetErrorStringWithFormat("The currently selected platform (%s) is "
- "the host platform and is always connected.",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "The currently selected platform ({0}) is "
+ "the host platform and is always connected.",
+ GetPluginName());
else
- error.SetErrorStringWithFormat(
- "Platform::ConnectRemote() is not supported by %s",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "Platform::ConnectRemote() is not supported by {0}", GetPluginName());
return error;
}
Status Platform::DisconnectRemote() {
Status error;
if (IsHost())
- error.SetErrorStringWithFormat("The currently selected platform (%s) is "
- "the host platform and is always connected.",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "The currently selected platform ({0}) is "
+ "the host platform and is always connected.",
+ GetPluginName());
else
- error.SetErrorStringWithFormat(
- "Platform::DisconnectRemote() is not supported by %s",
- GetPluginName().GetCString());
+ error.SetErrorStringWithFormatv(
+ "Platform::DisconnectRemote() is not supported by {0}",
+ GetPluginName());
return error;
}
@@ -1117,8 +1115,8 @@ lldb::ProcessSP Platform::DebugProcess(ProcessLaunchInfo &launch_info,
ProcessAttachInfo attach_info(launch_info);
process_sp = Attach(attach_info, debugger, &target, error);
if (process_sp) {
- LLDB_LOGF(log, "Platform::%s Attach() succeeded, Process plugin: %s",
- __FUNCTION__, process_sp->GetPluginName().AsCString());
+ LLDB_LOG(log, "Attach() succeeded, Process plugin: {0}",
+ process_sp->GetPluginName());
launch_info.SetHijackListener(attach_info.GetHijackListener());
// Since we attached to the process, it will think it needs to detach
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index c4f047a4caac1..bb719bcbf77db 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -2939,13 +2939,11 @@ void Process::CompleteAttach() {
dyld->DidAttach();
if (log) {
ModuleSP exe_module_sp = GetTarget().GetExecutableModule();
- LLDB_LOGF(log,
- "Process::%s after DynamicLoader::DidAttach(), target "
- "executable is %s (using %s plugin)",
- __FUNCTION__,
- exe_module_sp ? exe_module_sp->GetFileSpec().GetPath().c_str()
- : "<none>",
- dyld->GetPluginName().AsCString("<unnamed>"));
+ LLDB_LOG(log,
+ "after DynamicLoader::DidAttach(), target "
+ "executable is {0} (using {1} plugin)",
+ exe_module_sp ? exe_module_sp->GetFileSpec() : FileSpec(),
+ dyld->GetPluginName());
}
}
@@ -2956,13 +2954,11 @@ void Process::CompleteAttach() {
system_runtime->DidAttach();
if (log) {
ModuleSP exe_module_sp = GetTarget().GetExecutableModule();
- LLDB_LOGF(log,
- "Process::%s after SystemRuntime::DidAttach(), target "
- "executable is %s (using %s plugin)",
- __FUNCTION__,
- exe_module_sp ? exe_module_sp->GetFileSpec().GetPath().c_str()
- : "<none>",
- system_runtime->GetPluginName().AsCString("<unnamed>"));
+ LLDB_LOG(log,
+ "after SystemRuntime::DidAttach(), target "
+ "executable is {0} (using {1} plugin)",
+ exe_module_sp ? exe_module_sp->GetFileSpec() : FileSpec(),
+ system_runtime->GetPluginName());
}
}
@@ -5984,11 +5980,8 @@ void Process::MapSupportedStructuredDataPlugins(
m_structured_data_plugin_map.insert(
std::make_pair(type_name, plugin_sp));
names_to_remove.push_back(type_name);
- LLDB_LOGF(log,
- "Process::%s(): using plugin %s for type name "
- "%s",
- __FUNCTION__, plugin_sp->GetPluginName().GetCString(),
- type_name.GetCString());
+ LLDB_LOG(log, "using plugin {0} for type name {1}",
+ plugin_sp->GetPluginName(), type_name);
}
}
@@ -6112,8 +6105,7 @@ llvm::Expected<const MemoryTagManager *> Process::GetMemoryTagManager() {
if (!arch || !tag_manager) {
return llvm::createStringError(
llvm::inconvertibleErrorCode(),
- "This architecture does not support memory tagging",
- GetPluginName().GetCString());
+ "This architecture does not support memory tagging");
}
if (!SupportsMemoryTagging()) {
diff --git a/lldb/source/Target/ProcessTrace.cpp b/lldb/source/Target/ProcessTrace.cpp
index 6ddb30a8a9078..9d0deced5398a 100644
--- a/lldb/source/Target/ProcessTrace.cpp
+++ b/lldb/source/Target/ProcessTrace.cpp
@@ -57,8 +57,6 @@ ProcessTrace::~ProcessTrace() {
Finalize();
}
-ConstString ProcessTrace::GetPluginName() { return GetPluginNameStatic(); }
-
void ProcessTrace::DidAttach(ArchSpec &process_arch) {
ListenerSP listener_sp(
Listener::MakeListener("lldb.process_trace.did_attach_listener"));
diff --git a/lldb/source/Target/RemoteAwarePlatform.cpp b/lldb/source/Target/RemoteAwarePlatform.cpp
index b0c43ffa839e8..61a84e878c668 100644
--- a/lldb/source/Target/RemoteAwarePlatform.cpp
+++ b/lldb/source/Target/RemoteAwarePlatform.cpp
@@ -154,10 +154,10 @@ Status RemoteAwarePlatform::ResolveExecutable(
if (error.Fail() || !exe_module_sp) {
if (FileSystem::Instance().Readable(
resolved_module_spec.GetFileSpec())) {
- error.SetErrorStringWithFormat(
- "'%s' doesn't contain any '%s' platform architectures: %s",
- resolved_module_spec.GetFileSpec().GetPath().c_str(),
- GetPluginName().GetCString(), arch_names.GetData());
+ error.SetErrorStringWithFormatv(
+ "'{0}' doesn't contain any '{1}' platform architectures: {2}",
+ resolved_module_spec.GetFileSpec(), GetPluginName(),
+ arch_names.GetData());
} else {
error.SetErrorStringWithFormat(
"'%s' is not readable",
diff --git a/lldb/source/Target/Trace.cpp b/lldb/source/Target/Trace.cpp
index 827f3264c0964..06dc05af9d459 100644
--- a/lldb/source/Target/Trace.cpp
+++ b/lldb/source/Target/Trace.cpp
@@ -108,23 +108,21 @@ Error Trace::Stop() {
if (!m_live_process)
return createStringError(inconvertibleErrorCode(),
"Tracing requires a live process.");
- return m_live_process->TraceStop(
- TraceStopRequest(GetPluginName().AsCString()));
+ return m_live_process->TraceStop(TraceStopRequest(GetPluginName()));
}
Error Trace::Stop(llvm::ArrayRef<lldb::tid_t> tids) {
if (!m_live_process)
return createStringError(inconvertibleErrorCode(),
"Tracing requires a live process.");
- return m_live_process->TraceStop(
- TraceStopRequest(GetPluginName().AsCString(), tids));
+ return m_live_process->TraceStop(TraceStopRequest(GetPluginName(), tids));
}
Expected<std::string> Trace::GetLiveProcessState() {
if (!m_live_process)
return createStringError(inconvertibleErrorCode(),
"Tracing requires a live process.");
- return m_live_process->TraceGetState(GetPluginName().AsCString());
+ return m_live_process->TraceGetState(GetPluginName());
}
Optional<size_t> Trace::GetLiveThreadBinaryDataSize(lldb::tid_t tid,
@@ -158,7 +156,7 @@ Trace::GetLiveThreadBinaryData(lldb::tid_t tid, llvm::StringRef kind) {
"Tracing data \"%s\" is not available for thread %" PRIu64 ".",
kind.data(), tid);
- TraceGetBinaryDataRequest request{GetPluginName().AsCString(), kind.str(),
+ TraceGetBinaryDataRequest request{GetPluginName().str(), kind.str(),
static_cast<int64_t>(tid), 0,
static_cast<int64_t>(*size)};
return m_live_process->TraceGetBinaryData(request);
@@ -175,8 +173,8 @@ Trace::GetLiveProcessBinaryData(llvm::StringRef kind) {
inconvertibleErrorCode(),
"Tracing data \"%s\" is not available for the process.", kind.data());
- TraceGetBinaryDataRequest request{GetPluginName().AsCString(), kind.str(),
- None, 0, static_cast<int64_t>(*size)};
+ TraceGetBinaryDataRequest request{GetPluginName().str(), kind.str(), None, 0,
+ static_cast<int64_t>(*size)};
return m_live_process->TraceGetBinaryData(request);
}
diff --git a/lldb/test/Shell/SymbolFile/NativePDB/locate-pdb.cpp b/lldb/test/Shell/SymbolFile/NativePDB/locate-pdb.cpp
index 47abea1294832..7b3f6f9767961 100644
--- a/lldb/test/Shell/SymbolFile/NativePDB/locate-pdb.cpp
+++ b/lldb/test/Shell/SymbolFile/NativePDB/locate-pdb.cpp
@@ -31,4 +31,4 @@ int main(int argc, char** argv) {
// CHECK: (lldb) target modules dump symfile
// CHECK: Dumping debug symbols for 1 modules.
-// CHECK: SymbolFile pdb
+// CHECK: SymbolFile native-pdb
diff --git a/lldb/unittests/Expression/DWARFExpressionTest.cpp b/lldb/unittests/Expression/DWARFExpressionTest.cpp
index c8ef648b9fbb9..fc4a63ce6a7b4 100644
--- a/lldb/unittests/Expression/DWARFExpressionTest.cpp
+++ b/lldb/unittests/Expression/DWARFExpressionTest.cpp
@@ -309,7 +309,7 @@ TEST_F(DWARFExpressionMockProcessTest, DW_OP_deref) {
struct MockProcess : Process {
using Process::Process;
- ConstString GetPluginName() override { return ConstString("mock process"); }
+ llvm::StringRef GetPluginName() override { return "mock process"; }
bool CanDebug(lldb::TargetSP target,
bool plugin_specified_by_name) override {
return false;
diff --git a/lldb/unittests/Language/CLanguages/CLanguagesTest.cpp b/lldb/unittests/Language/CLanguages/CLanguagesTest.cpp
index c68bd56c337a4..acabb8386cd96 100644
--- a/lldb/unittests/Language/CLanguages/CLanguagesTest.cpp
+++ b/lldb/unittests/Language/CLanguages/CLanguagesTest.cpp
@@ -17,13 +17,13 @@
using namespace lldb_private;
-/// Returns the name of the LLDB plugin for the given language or a null
-/// ConstString if there is no fitting plugin.
-static ConstString GetPluginName(lldb::LanguageType language) {
+/// Returns the name of the LLDB plugin for the given language or an empty
+/// string if there is no fitting plugin.
+static llvm::StringRef GetPluginName(lldb::LanguageType language) {
Language *language_plugin = Language::FindPlugin(language);
if (language_plugin)
return language_plugin->GetPluginName();
- return ConstString();
+ return "";
}
TEST(CLanguages, LookupCLanguagesByLanguageType) {
diff --git a/lldb/unittests/Process/ProcessEventDataTest.cpp b/lldb/unittests/Process/ProcessEventDataTest.cpp
index f23381073a1cf..561915aa30f05 100644
--- a/lldb/unittests/Process/ProcessEventDataTest.cpp
+++ b/lldb/unittests/Process/ProcessEventDataTest.cpp
@@ -57,7 +57,7 @@ class DummyProcess : public Process {
ThreadList &new_thread_list) override {
return false;
}
- ConstString GetPluginName() override { return ConstString("Dummy"); }
+ llvm::StringRef GetPluginName() override { return "Dummy"; }
ProcessModID &GetModIDNonConstRef() { return m_mod_id; }
};
diff --git a/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp b/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp
index 92fb798d5d481..da5036ed4c770 100644
--- a/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp
+++ b/lldb/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp
@@ -62,7 +62,8 @@ TEST_F(SymbolFileDWARFTests, TestAbilitiesForDWARF) {
SymbolFile *symfile = module->GetSymbolFile();
ASSERT_NE(nullptr, symfile);
- EXPECT_EQ(symfile->GetPluginName(), SymbolFileDWARF::GetPluginNameStatic());
+ EXPECT_EQ(symfile->GetPluginName(),
+ SymbolFileDWARF::GetPluginNameStatic().GetStringRef());
uint32_t expected_abilities = SymbolFile::kAllAbilities;
EXPECT_EQ(expected_abilities, symfile->CalculateAbilities());
diff --git a/lldb/unittests/Target/ExecutionContextTest.cpp b/lldb/unittests/Target/ExecutionContextTest.cpp
index 4677857f85385..ec9e42fa4b192 100644
--- a/lldb/unittests/Target/ExecutionContextTest.cpp
+++ b/lldb/unittests/Target/ExecutionContextTest.cpp
@@ -62,7 +62,7 @@ class DummyProcess : public Process {
ThreadList &new_thread_list) override {
return false;
}
- ConstString GetPluginName() override { return ConstString("Dummy"); }
+ llvm::StringRef GetPluginName() override { return "Dummy"; }
};
} // namespace
diff --git a/lldb/unittests/Target/RemoteAwarePlatformTest.cpp b/lldb/unittests/Target/RemoteAwarePlatformTest.cpp
index 5d9c4ba82b5cc..b96fbb8731cfd 100644
--- a/lldb/unittests/Target/RemoteAwarePlatformTest.cpp
+++ b/lldb/unittests/Target/RemoteAwarePlatformTest.cpp
@@ -25,7 +25,7 @@ class RemoteAwarePlatformTester : public RemoteAwarePlatform {
using RemoteAwarePlatform::RemoteAwarePlatform;
MOCK_METHOD0(GetDescription, const char *());
- MOCK_METHOD0(GetPluginName, ConstString());
+ MOCK_METHOD0(GetPluginName, llvm::StringRef());
MOCK_METHOD2(GetSupportedArchitectureAtIndex, bool(uint32_t, ArchSpec &));
MOCK_METHOD4(Attach,
ProcessSP(ProcessAttachInfo &, Debugger &, Target *, Status &));
@@ -41,7 +41,7 @@ class TargetPlatformTester : public Platform {
using Platform::Platform;
MOCK_METHOD0(GetDescription, const char *());
- MOCK_METHOD0(GetPluginName, ConstString());
+ MOCK_METHOD0(GetPluginName, llvm::StringRef());
MOCK_METHOD2(GetSupportedArchitectureAtIndex, bool(uint32_t, ArchSpec &));
MOCK_METHOD4(Attach,
ProcessSP(ProcessAttachInfo &, Debugger &, Target *, Status &));
diff --git a/lldb/unittests/Thread/ThreadTest.cpp b/lldb/unittests/Thread/ThreadTest.cpp
index e438b049b9a38..9851d98f496d4 100644
--- a/lldb/unittests/Thread/ThreadTest.cpp
+++ b/lldb/unittests/Thread/ThreadTest.cpp
@@ -55,7 +55,7 @@ class DummyProcess : public Process {
ThreadList &new_thread_list) override {
return false;
}
- ConstString GetPluginName() override { return ConstString("Dummy"); }
+ llvm::StringRef GetPluginName() override { return "Dummy"; }
ProcessModID &GetModIDNonConstRef() { return m_mod_id; }
};
More information about the lldb-commits
mailing list