[Lldb-commits] [lldb] ccad194 - [lldb/Plugins] Rename initializers to match their plugin name.

Jonas Devlieghere via lldb-commits lldb-commits at lists.llvm.org
Mon Feb 17 20:18:02 PST 2020 

Author: Jonas Devlieghere
Date: 2020-02-17T20:07:53-08:00
New Revision: ccad1948618d13a86e8a30488ba1ace8b7fd6b73

URL: https://github.com/llvm/llvm-project/commit/ccad1948618d13a86e8a30488ba1ace8b7fd6b73
DIFF: https://github.com/llvm/llvm-project/commit/ccad1948618d13a86e8a30488ba1ace8b7fd6b73.diff

LOG: [lldb/Plugins] Rename initializers to match their plugin name.

Use LLDB_PLUGIN_DEFINE_ADV to make the name of the generated initializer
match the name of the plugin. This is a step towards generating the
initializers with a def file. I'm landing this change in pieces so I can
narrow down what exactly breaks the Windows bot.

Added: 
    

Modified: 
    lldb/source/API/SystemInitializerFull.cpp
    lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
    lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
    lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
    lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
    lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp
    lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp
    lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
    lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
    lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
    lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
    lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
    lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
    lldb/tools/lldb-test/SystemInitializerTest.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/source/API/SystemInitializerFull.cpp b/lldb/source/API/SystemInitializerFull.cpp
index 1933cc57259e..9a067c1de9ad 100644
--- a/lldb/source/API/SystemInitializerFull.cpp
+++ b/lldb/source/API/SystemInitializerFull.cpp
@@ -38,7 +38,7 @@ LLDB_PLUGIN_DECLARE(ObjectFileMachO)
 LLDB_PLUGIN_DECLARE(ObjectFilePECOFF)
 LLDB_PLUGIN_DECLARE(ObjectFileWasm)
 LLDB_PLUGIN_DECLARE(ObjectContainerBSDArchive)
-LLDB_PLUGIN_DECLARE(ObjectContainerUniversalMachO)
+LLDB_PLUGIN_DECLARE(ObjectContainerMachOArchive)
 LLDB_PLUGIN_DECLARE(ScriptInterpreterNone)
 #if LLDB_ENABLE_PYTHON
 LLDB_PLUGIN_DECLARE(OperatingSystemPython)
@@ -75,13 +75,13 @@ LLDB_PLUGIN_DECLARE(SymbolFilePDB)
 LLDB_PLUGIN_DECLARE(SymbolFileSymtab)
 LLDB_PLUGIN_DECLARE(SymbolVendorWasm)
 LLDB_PLUGIN_DECLARE(UnwindAssemblyInstEmulation)
-LLDB_PLUGIN_DECLARE(UnwindAssembly_x86)
-LLDB_PLUGIN_DECLARE(EmulateInstructionARM)
-LLDB_PLUGIN_DECLARE(EmulateInstructionARM64)
-LLDB_PLUGIN_DECLARE(EmulateInstructionMIPS)
-LLDB_PLUGIN_DECLARE(EmulateInstructionMIPS64)
-LLDB_PLUGIN_DECLARE(EmulateInstructionPPC64)
-LLDB_PLUGIN_DECLARE(ItaniumABILanguageRuntime)
+LLDB_PLUGIN_DECLARE(UnwindAssemblyX86)
+LLDB_PLUGIN_DECLARE(InstructionARM)
+LLDB_PLUGIN_DECLARE(InstructionARM64)
+LLDB_PLUGIN_DECLARE(InstructionMIPS)
+LLDB_PLUGIN_DECLARE(InstructionMIPS64)
+LLDB_PLUGIN_DECLARE(InstructionPPC64)
+LLDB_PLUGIN_DECLARE(CXXItaniumABI)
 LLDB_PLUGIN_DECLARE(AppleObjCRuntime)
 LLDB_PLUGIN_DECLARE(SystemRuntimeMacOSX)
 LLDB_PLUGIN_DECLARE(RenderScriptRuntime)
@@ -89,21 +89,21 @@ LLDB_PLUGIN_DECLARE(CPlusPlusLanguage)
 LLDB_PLUGIN_DECLARE(ObjCLanguage)
 LLDB_PLUGIN_DECLARE(ObjCPlusPlusLanguage)
 #if defined(_WIN32)
-LLDB_PLUGIN_DECLARE(ProcessWindows)
+LLDB_PLUGIN_DECLARE(ProcessWindowsCommon)
 #endif
 #if defined(__FreeBSD__)
 LLDB_PLUGIN_DECLARE(ProcessFreeBSD)
 #endif
 #if defined(__APPLE__)
 LLDB_PLUGIN_DECLARE(SymbolVendorMacOSX)
-LLDB_PLUGIN_DECLARE(ProcessKDP)
+LLDB_PLUGIN_DECLARE(ProcessMacOSXKernel)
 LLDB_PLUGIN_DECLARE(DynamicLoaderDarwinKernel)
 #endif
 LLDB_PLUGIN_DECLARE(StructuredDataDarwinLog)
-LLDB_PLUGIN_DECLARE(PlatformRemoteGDBServer)
+LLDB_PLUGIN_DECLARE(PlatformGDB)
 LLDB_PLUGIN_DECLARE(ProcessGDBRemote)
 LLDB_PLUGIN_DECLARE(DynamicLoaderMacOSXDYLD)
-LLDB_PLUGIN_DECLARE(DynamicLoaderPOSIXDYLD)
+LLDB_PLUGIN_DECLARE(DynamicLoaderPosixDYLD)
 LLDB_PLUGIN_DECLARE(DynamicLoaderStatic)
 LLDB_PLUGIN_DECLARE(DynamicLoaderWasmDYLD)
 LLDB_PLUGIN_DECLARE(DynamicLoaderWindowsDYLD)
@@ -145,7 +145,7 @@ llvm::Error SystemInitializerFull::Initialize() {
   LLDB_PLUGIN_INITIALIZE(ObjectFileWasm);
 
   LLDB_PLUGIN_INITIALIZE(ObjectContainerBSDArchive);
-  LLDB_PLUGIN_INITIALIZE(ObjectContainerUniversalMachO);
+  LLDB_PLUGIN_INITIALIZE(ObjectContainerMachOArchive);
 
   LLDB_PLUGIN_INITIALIZE(ScriptInterpreterNone);
 
@@ -202,15 +202,15 @@ llvm::Error SystemInitializerFull::Initialize() {
   LLDB_PLUGIN_INITIALIZE(SymbolFileSymtab);
   LLDB_PLUGIN_INITIALIZE(SymbolVendorWasm);
   LLDB_PLUGIN_INITIALIZE(UnwindAssemblyInstEmulation);
-  LLDB_PLUGIN_INITIALIZE(UnwindAssembly_x86);
+  LLDB_PLUGIN_INITIALIZE(UnwindAssemblyX86);
 
-  LLDB_PLUGIN_INITIALIZE(EmulateInstructionARM);
-  LLDB_PLUGIN_INITIALIZE(EmulateInstructionARM64);
-  LLDB_PLUGIN_INITIALIZE(EmulateInstructionMIPS);
-  LLDB_PLUGIN_INITIALIZE(EmulateInstructionMIPS64);
-  LLDB_PLUGIN_INITIALIZE(EmulateInstructionPPC64);
+  LLDB_PLUGIN_INITIALIZE(InstructionARM);
+  LLDB_PLUGIN_INITIALIZE(InstructionARM64);
+  LLDB_PLUGIN_INITIALIZE(InstructionMIPS);
+  LLDB_PLUGIN_INITIALIZE(InstructionMIPS64);
+  LLDB_PLUGIN_INITIALIZE(InstructionPPC64);
 
-  LLDB_PLUGIN_INITIALIZE(ItaniumABILanguageRuntime);
+  LLDB_PLUGIN_INITIALIZE(CXXItaniumABI);
   LLDB_PLUGIN_INITIALIZE(AppleObjCRuntime);
   LLDB_PLUGIN_INITIALIZE(SystemRuntimeMacOSX);
   LLDB_PLUGIN_INITIALIZE(RenderScriptRuntime);
@@ -220,14 +220,14 @@ llvm::Error SystemInitializerFull::Initialize() {
   LLDB_PLUGIN_INITIALIZE(ObjCPlusPlusLanguage);
 
 #if defined(_WIN32)
-  LLDB_PLUGIN_INITIALIZE(ProcessWindows);
+  LLDB_PLUGIN_INITIALIZE(ProcessWindowsCommon);
 #endif
 #if defined(__FreeBSD__)
   LLDB_PLUGIN_INITIALIZE(ProcessFreeBSD);
 #endif
 #if defined(__APPLE__)
   LLDB_PLUGIN_INITIALIZE(SymbolVendorMacOSX);
-  LLDB_PLUGIN_INITIALIZE(ProcessKDP);
+  LLDB_PLUGIN_INITIALIZE(ProcessMacOSXKernel);
   LLDB_PLUGIN_INITIALIZE(DynamicLoaderDarwinKernel);
 #endif
 
@@ -236,11 +236,11 @@ llvm::Error SystemInitializerFull::Initialize() {
   LLDB_PLUGIN_INITIALIZE(StructuredDataDarwinLog);
 
   // Platform agnostic plugins
-  LLDB_PLUGIN_INITIALIZE(PlatformRemoteGDBServer);
+  LLDB_PLUGIN_INITIALIZE(PlatformGDB);
 
   LLDB_PLUGIN_INITIALIZE(ProcessGDBRemote);
   LLDB_PLUGIN_INITIALIZE(DynamicLoaderMacOSXDYLD);
-  LLDB_PLUGIN_INITIALIZE(DynamicLoaderPOSIXDYLD);
+  LLDB_PLUGIN_INITIALIZE(DynamicLoaderPosixDYLD);
   LLDB_PLUGIN_INITIALIZE(DynamicLoaderWasmDYLD); // Before DynamicLoaderStatic.
   LLDB_PLUGIN_INITIALIZE(DynamicLoaderStatic);
   LLDB_PLUGIN_INITIALIZE(DynamicLoaderWindowsDYLD);
@@ -294,16 +294,16 @@ void SystemInitializerFull::Terminate() {
   LLDB_PLUGIN_TERMINATE(SymbolFileDWARF);
   LLDB_PLUGIN_TERMINATE(SymbolFilePDB);
   LLDB_PLUGIN_TERMINATE(SymbolFileSymtab);
-  LLDB_PLUGIN_TERMINATE(UnwindAssembly_x86);
+  LLDB_PLUGIN_TERMINATE(UnwindAssemblyX86);
   LLDB_PLUGIN_TERMINATE(UnwindAssemblyInstEmulation);
 
-  LLDB_PLUGIN_TERMINATE(EmulateInstructionARM);
-  LLDB_PLUGIN_TERMINATE(EmulateInstructionARM64);
-  LLDB_PLUGIN_TERMINATE(EmulateInstructionMIPS);
-  LLDB_PLUGIN_TERMINATE(EmulateInstructionMIPS64);
-  LLDB_PLUGIN_TERMINATE(EmulateInstructionPPC64);
+  LLDB_PLUGIN_TERMINATE(InstructionARM);
+  LLDB_PLUGIN_TERMINATE(InstructionARM64);
+  LLDB_PLUGIN_TERMINATE(InstructionMIPS);
+  LLDB_PLUGIN_TERMINATE(InstructionMIPS64);
+  LLDB_PLUGIN_TERMINATE(InstructionPPC64);
 
-  LLDB_PLUGIN_TERMINATE(ItaniumABILanguageRuntime);
+  LLDB_PLUGIN_TERMINATE(CXXItaniumABI);
   LLDB_PLUGIN_TERMINATE(AppleObjCRuntime);
   LLDB_PLUGIN_TERMINATE(SystemRuntimeMacOSX);
   LLDB_PLUGIN_TERMINATE(RenderScriptRuntime);
@@ -314,7 +314,7 @@ void SystemInitializerFull::Terminate() {
 
 #if defined(__APPLE__)
   LLDB_PLUGIN_TERMINATE(DynamicLoaderDarwinKernel);
-  LLDB_PLUGIN_TERMINATE(ProcessKDP);
+  LLDB_PLUGIN_TERMINATE(ProcessMacOSXKernel);
   LLDB_PLUGIN_TERMINATE(SymbolVendorMacOSX);
 #endif
 
@@ -323,12 +323,12 @@ void SystemInitializerFull::Terminate() {
 #endif
   Debugger::SettingsTerminate();
 
-  LLDB_PLUGIN_TERMINATE(PlatformRemoteGDBServer);
+  LLDB_PLUGIN_TERMINATE(PlatformGDB);
   LLDB_PLUGIN_TERMINATE(ProcessGDBRemote);
   LLDB_PLUGIN_TERMINATE(StructuredDataDarwinLog);
 
   LLDB_PLUGIN_TERMINATE(DynamicLoaderMacOSXDYLD);
-  LLDB_PLUGIN_TERMINATE(DynamicLoaderPOSIXDYLD);
+  LLDB_PLUGIN_TERMINATE(DynamicLoaderPosixDYLD);
   LLDB_PLUGIN_TERMINATE(DynamicLoaderWasmDYLD);
   LLDB_PLUGIN_TERMINATE(DynamicLoaderStatic);
   LLDB_PLUGIN_TERMINATE(DynamicLoaderWindowsDYLD);
@@ -348,7 +348,7 @@ void SystemInitializerFull::Terminate() {
   LLDB_PLUGIN_TERMINATE(ObjectFileWasm);
 
   LLDB_PLUGIN_TERMINATE(ObjectContainerBSDArchive);
-  LLDB_PLUGIN_TERMINATE(ObjectContainerUniversalMachO);
+  LLDB_PLUGIN_TERMINATE(ObjectContainerMachOArchive);
 
 #if LLDB_ENABLE_PYTHON
   LLDB_PLUGIN_TERMINATE(OperatingSystemPython);

diff  --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
index c572c3024f9c..ac60af5336ed 100644
--- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
+++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
@@ -29,7 +29,7 @@
 using namespace lldb;
 using namespace lldb_private;
 
-LLDB_PLUGIN_DEFINE(DynamicLoaderPOSIXDYLD)
+LLDB_PLUGIN_DEFINE_ADV(DynamicLoaderPOSIXDYLD, DynamicLoaderPosixDYLD)
 
 void DynamicLoaderPOSIXDYLD::Initialize() {
   PluginManager::RegisterPlugin(GetPluginNameStatic(),

diff  --git a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
index e87bc1f75f5c..aa99db418283 100644
--- a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
+++ b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
@@ -30,7 +30,7 @@
 using namespace lldb;
 using namespace lldb_private;
 
-LLDB_PLUGIN_DEFINE(EmulateInstructionARM)
+LLDB_PLUGIN_DEFINE_ADV(EmulateInstructionARM, InstructionARM)
 
 // Convenient macro definitions.
 #define APSR_C Bit32(m_opcode_cpsr, CPSR_C_POS)

diff  --git a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
index 144d38373247..f58453909426 100644
--- a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
+++ b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
@@ -47,7 +47,7 @@
 using namespace lldb;
 using namespace lldb_private;
 
-LLDB_PLUGIN_DEFINE(EmulateInstructionARM64)
+LLDB_PLUGIN_DEFINE_ADV(EmulateInstructionARM64, InstructionARM64)
 
 static bool LLDBTableGetRegisterInfo(uint32_t reg_num, RegisterInfo &reg_info) {
   if (reg_num >= llvm::array_lengthof(g_register_infos_arm64_le))

diff  --git a/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp b/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
index ae74c89c4f2e..61eb8912295f 100644
--- a/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
+++ b/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
@@ -40,7 +40,7 @@
 using namespace lldb;
 using namespace lldb_private;
 
-LLDB_PLUGIN_DEFINE(EmulateInstructionMIPS)
+LLDB_PLUGIN_DEFINE_ADV(EmulateInstructionMIPS, InstructionMIPS)
 
 #define UInt(x) ((uint64_t)x)
 #define integer int64_t

diff  --git a/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp b/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp
index 9a578ab408f7..b8305591749b 100644
--- a/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp
+++ b/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp
@@ -40,7 +40,7 @@
 using namespace lldb;
 using namespace lldb_private;
 
-LLDB_PLUGIN_DEFINE(EmulateInstructionMIPS64)
+LLDB_PLUGIN_DEFINE_ADV(EmulateInstructionMIPS64, InstructionMIPS64)
 
 #define UInt(x) ((uint64_t)x)
 #define integer int64_t

diff  --git a/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp b/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp
index 2588c935dd6b..1cab8fdd6e2a 100644
--- a/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp
+++ b/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp
@@ -25,7 +25,7 @@
 using namespace lldb;
 using namespace lldb_private;
 
-LLDB_PLUGIN_DEFINE(EmulateInstructionPPC64)
+LLDB_PLUGIN_DEFINE_ADV(EmulateInstructionPPC64, InstructionPPC64)
 
 EmulateInstructionPPC64::EmulateInstructionPPC64(const ArchSpec &arch)
     : EmulateInstruction(arch) {}

diff  --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
index e08f0f070f6c..df2aaca8a943 100644
--- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
@@ -40,7 +40,7 @@
 using namespace lldb;
 using namespace lldb_private;
 
-LLDB_PLUGIN_DEFINE(ItaniumABILanguageRuntime)
+LLDB_PLUGIN_DEFINE_ADV(ItaniumABILanguageRuntime, CXXItaniumABI)
 
 static const char *vtable_demangled_prefix = "vtable for ";
 

diff  --git a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
index bc30e57d1d0c..bb56379ed1e4 100644
--- a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
+++ b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
@@ -20,7 +20,8 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace llvm::MachO;
 
-LLDB_PLUGIN_DEFINE(ObjectContainerUniversalMachO)
+LLDB_PLUGIN_DEFINE_ADV(ObjectContainerUniversalMachO,
+                       ObjectContainerMachOArchive)
 
 void ObjectContainerUniversalMachO::Initialize() {
   PluginManager::RegisterPlugin(GetPluginNameStatic(),

diff  --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
index 550b68090e7a..b0467555665c 100644
--- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
+++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
@@ -35,7 +35,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::platform_gdb_server;
 
-LLDB_PLUGIN_DEFINE(PlatformRemoteGDBServer)
+LLDB_PLUGIN_DEFINE_ADV(PlatformRemoteGDBServer, PlatformGDB)
 
 static bool g_initialized = false;
 

diff  --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
index e78912e3cd30..09d1965f25ed 100644
--- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
+++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
@@ -50,7 +50,7 @@
 using namespace lldb;
 using namespace lldb_private;
 
-LLDB_PLUGIN_DEFINE(ProcessKDP)
+LLDB_PLUGIN_DEFINE_ADV(ProcessKDP, ProcessMacOSXKernel)
 
 namespace {
 

diff  --git a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
index 286a95fa5894..7b020f55e993 100644
--- a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
+++ b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
@@ -44,7 +44,7 @@
 using namespace lldb;
 using namespace lldb_private;
 
-LLDB_PLUGIN_DEFINE(ProcessWindows)
+LLDB_PLUGIN_DEFINE_ADV(ProcessWindows, ProcessWindowsCommon)
 
 namespace {
 std::string GetProcessExecutableName(HANDLE process_handle) {

diff  --git a/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp b/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
index 430ba09b811c..dc62e957c1a1 100644
--- a/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
+++ b/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
@@ -30,7 +30,7 @@
 using namespace lldb;
 using namespace lldb_private;
 
-LLDB_PLUGIN_DEFINE(UnwindAssembly_x86)
+LLDB_PLUGIN_DEFINE_ADV(UnwindAssembly_x86, UnwindAssemblyX86)
 
 //  UnwindAssemblyParser_x86 method definitions
 

diff  --git a/lldb/tools/lldb-test/SystemInitializerTest.cpp b/lldb/tools/lldb-test/SystemInitializerTest.cpp
index 89febfaf118c..6112dd234fb2 100644
--- a/lldb/tools/lldb-test/SystemInitializerTest.cpp
+++ b/lldb/tools/lldb-test/SystemInitializerTest.cpp
@@ -31,7 +31,7 @@ LLDB_PLUGIN_DECLARE(ObjectFileMachO)
 LLDB_PLUGIN_DECLARE(ObjectFilePECOFF)
 LLDB_PLUGIN_DECLARE(ObjectFileWasm)
 LLDB_PLUGIN_DECLARE(ObjectContainerBSDArchive)
-LLDB_PLUGIN_DECLARE(ObjectContainerUniversalMachO)
+LLDB_PLUGIN_DECLARE(ObjectContainerMachOArchive)
 LLDB_PLUGIN_DECLARE(ScriptInterpreterNone)
 LLDB_PLUGIN_DECLARE(PlatformFreeBSD)
 LLDB_PLUGIN_DECLARE(PlatformLinux)
@@ -61,13 +61,13 @@ LLDB_PLUGIN_DECLARE(SymbolFilePDB)
 LLDB_PLUGIN_DECLARE(SymbolFileSymtab)
 LLDB_PLUGIN_DECLARE(SymbolVendorWasm)
 LLDB_PLUGIN_DECLARE(UnwindAssemblyInstEmulation)
-LLDB_PLUGIN_DECLARE(UnwindAssembly_x86)
-LLDB_PLUGIN_DECLARE(EmulateInstructionARM)
-LLDB_PLUGIN_DECLARE(EmulateInstructionARM64)
-LLDB_PLUGIN_DECLARE(EmulateInstructionMIPS)
-LLDB_PLUGIN_DECLARE(EmulateInstructionMIPS64)
-LLDB_PLUGIN_DECLARE(EmulateInstructionPPC64)
-LLDB_PLUGIN_DECLARE(ItaniumABILanguageRuntime)
+LLDB_PLUGIN_DECLARE(UnwindAssemblyX86)
+LLDB_PLUGIN_DECLARE(InstructionARM)
+LLDB_PLUGIN_DECLARE(InstructionARM64)
+LLDB_PLUGIN_DECLARE(InstructionMIPS)
+LLDB_PLUGIN_DECLARE(InstructionMIPS64)
+LLDB_PLUGIN_DECLARE(InstructionPPC64)
+LLDB_PLUGIN_DECLARE(CXXItaniumABI)
 LLDB_PLUGIN_DECLARE(AppleObjCRuntime)
 LLDB_PLUGIN_DECLARE(SystemRuntimeMacOSX)
 LLDB_PLUGIN_DECLARE(RenderScriptRuntime)
@@ -75,21 +75,21 @@ LLDB_PLUGIN_DECLARE(CPlusPlusLanguage)
 LLDB_PLUGIN_DECLARE(ObjCLanguage)
 LLDB_PLUGIN_DECLARE(ObjCPlusPlusLanguage)
 #if defined(_WIN32)
-LLDB_PLUGIN_DECLARE(ProcessWindows)
+LLDB_PLUGIN_DECLARE(ProcessWindowsCommon)
 #endif
 #if defined(__FreeBSD__)
 LLDB_PLUGIN_DECLARE(ProcessFreeBSD)
 #endif
 #if defined(__APPLE__)
 LLDB_PLUGIN_DECLARE(SymbolVendorMacOSX)
-LLDB_PLUGIN_DECLARE(ProcessKDP)
+LLDB_PLUGIN_DECLARE(ProcessMacOSXKernel)
 LLDB_PLUGIN_DECLARE(DynamicLoaderDarwinKernel)
 #endif
 LLDB_PLUGIN_DECLARE(StructuredDataDarwinLog)
-LLDB_PLUGIN_DECLARE(PlatformRemoteGDBServer)
+LLDB_PLUGIN_DECLARE(PlatformGDB)
 LLDB_PLUGIN_DECLARE(ProcessGDBRemote)
 LLDB_PLUGIN_DECLARE(DynamicLoaderMacOSXDYLD)
-LLDB_PLUGIN_DECLARE(DynamicLoaderPOSIXDYLD)
+LLDB_PLUGIN_DECLARE(DynamicLoaderPosixDYLD)
 LLDB_PLUGIN_DECLARE(DynamicLoaderStatic)
 LLDB_PLUGIN_DECLARE(DynamicLoaderWasmDYLD)
 LLDB_PLUGIN_DECLARE(DynamicLoaderWindowsDYLD)
@@ -131,7 +131,7 @@ llvm::Error SystemInitializerTest::Initialize() {
   LLDB_PLUGIN_INITIALIZE(ObjectFileWasm);
 
   LLDB_PLUGIN_INITIALIZE(ObjectContainerBSDArchive);
-  LLDB_PLUGIN_INITIALIZE(ObjectContainerUniversalMachO);
+  LLDB_PLUGIN_INITIALIZE(ObjectContainerMachOArchive);
 
   LLDB_PLUGIN_INITIALIZE(ScriptInterpreterNone);
 
@@ -177,15 +177,15 @@ llvm::Error SystemInitializerTest::Initialize() {
   LLDB_PLUGIN_INITIALIZE(SymbolFileSymtab);
   LLDB_PLUGIN_INITIALIZE(SymbolVendorWasm);
   LLDB_PLUGIN_INITIALIZE(UnwindAssemblyInstEmulation);
-  LLDB_PLUGIN_INITIALIZE(UnwindAssembly_x86);
+  LLDB_PLUGIN_INITIALIZE(UnwindAssemblyX86);
 
-  LLDB_PLUGIN_INITIALIZE(EmulateInstructionARM);
-  LLDB_PLUGIN_INITIALIZE(EmulateInstructionARM64);
-  LLDB_PLUGIN_INITIALIZE(EmulateInstructionMIPS);
-  LLDB_PLUGIN_INITIALIZE(EmulateInstructionMIPS64);
-  LLDB_PLUGIN_INITIALIZE(EmulateInstructionPPC64);
+  LLDB_PLUGIN_INITIALIZE(InstructionARM);
+  LLDB_PLUGIN_INITIALIZE(InstructionARM64);
+  LLDB_PLUGIN_INITIALIZE(InstructionMIPS);
+  LLDB_PLUGIN_INITIALIZE(InstructionMIPS64);
+  LLDB_PLUGIN_INITIALIZE(InstructionPPC64);
 
-  LLDB_PLUGIN_INITIALIZE(ItaniumABILanguageRuntime);
+  LLDB_PLUGIN_INITIALIZE(CXXItaniumABI);
   LLDB_PLUGIN_INITIALIZE(AppleObjCRuntime);
   LLDB_PLUGIN_INITIALIZE(SystemRuntimeMacOSX);
   LLDB_PLUGIN_INITIALIZE(RenderScriptRuntime);
@@ -195,14 +195,14 @@ llvm::Error SystemInitializerTest::Initialize() {
   LLDB_PLUGIN_INITIALIZE(ObjCPlusPlusLanguage);
 
 #if defined(_WIN32)
-  LLDB_PLUGIN_INITIALIZE(ProcessWindows);
+  LLDB_PLUGIN_INITIALIZE(ProcessWindowsCommon);
 #endif
 #if defined(__FreeBSD__)
   LLDB_PLUGIN_INITIALIZE(ProcessFreeBSD);
 #endif
 #if defined(__APPLE__)
   LLDB_PLUGIN_INITIALIZE(SymbolVendorMacOSX);
-  LLDB_PLUGIN_INITIALIZE(ProcessKDP);
+  LLDB_PLUGIN_INITIALIZE(ProcessMacOSXKernel);
   LLDB_PLUGIN_INITIALIZE(DynamicLoaderDarwinKernel);
 #endif
 
@@ -211,11 +211,11 @@ llvm::Error SystemInitializerTest::Initialize() {
   LLDB_PLUGIN_INITIALIZE(StructuredDataDarwinLog);
 
   // Platform agnostic plugins
-  LLDB_PLUGIN_INITIALIZE(PlatformRemoteGDBServer);
+  LLDB_PLUGIN_INITIALIZE(PlatformGDB);
 
   LLDB_PLUGIN_INITIALIZE(ProcessGDBRemote);
   LLDB_PLUGIN_INITIALIZE(DynamicLoaderMacOSXDYLD);
-  LLDB_PLUGIN_INITIALIZE(DynamicLoaderPOSIXDYLD);
+  LLDB_PLUGIN_INITIALIZE(DynamicLoaderPosixDYLD);
   LLDB_PLUGIN_INITIALIZE(DynamicLoaderWasmDYLD); // Before DynamicLoaderStatic.
   LLDB_PLUGIN_INITIALIZE(DynamicLoaderStatic);
   LLDB_PLUGIN_INITIALIZE(DynamicLoaderWindowsDYLD);
@@ -269,16 +269,16 @@ void SystemInitializerTest::Terminate() {
   LLDB_PLUGIN_TERMINATE(SymbolFileDWARF);
   LLDB_PLUGIN_TERMINATE(SymbolFilePDB);
   LLDB_PLUGIN_TERMINATE(SymbolFileSymtab);
-  LLDB_PLUGIN_TERMINATE(UnwindAssembly_x86);
+  LLDB_PLUGIN_TERMINATE(UnwindAssemblyX86);
   LLDB_PLUGIN_TERMINATE(UnwindAssemblyInstEmulation);
 
-  LLDB_PLUGIN_TERMINATE(EmulateInstructionARM);
-  LLDB_PLUGIN_TERMINATE(EmulateInstructionARM64);
-  LLDB_PLUGIN_TERMINATE(EmulateInstructionMIPS);
-  LLDB_PLUGIN_TERMINATE(EmulateInstructionMIPS64);
-  LLDB_PLUGIN_TERMINATE(EmulateInstructionPPC64);
+  LLDB_PLUGIN_TERMINATE(InstructionARM);
+  LLDB_PLUGIN_TERMINATE(InstructionARM64);
+  LLDB_PLUGIN_TERMINATE(InstructionMIPS);
+  LLDB_PLUGIN_TERMINATE(InstructionMIPS64);
+  LLDB_PLUGIN_TERMINATE(InstructionPPC64);
 
-  LLDB_PLUGIN_TERMINATE(ItaniumABILanguageRuntime);
+  LLDB_PLUGIN_TERMINATE(CXXItaniumABI);
   LLDB_PLUGIN_TERMINATE(AppleObjCRuntime);
   LLDB_PLUGIN_TERMINATE(SystemRuntimeMacOSX);
   LLDB_PLUGIN_TERMINATE(RenderScriptRuntime);
@@ -289,7 +289,7 @@ void SystemInitializerTest::Terminate() {
 
 #if defined(__APPLE__)
   LLDB_PLUGIN_TERMINATE(DynamicLoaderDarwinKernel);
-  LLDB_PLUGIN_TERMINATE(ProcessKDP);
+  LLDB_PLUGIN_TERMINATE(ProcessMacOSXKernel);
   LLDB_PLUGIN_TERMINATE(SymbolVendorMacOSX);
 #endif
 
@@ -298,12 +298,12 @@ void SystemInitializerTest::Terminate() {
 #endif
   Debugger::SettingsTerminate();
 
-  LLDB_PLUGIN_TERMINATE(PlatformRemoteGDBServer);
+  LLDB_PLUGIN_TERMINATE(PlatformGDB);
   LLDB_PLUGIN_TERMINATE(ProcessGDBRemote);
   LLDB_PLUGIN_TERMINATE(StructuredDataDarwinLog);
 
   LLDB_PLUGIN_TERMINATE(DynamicLoaderMacOSXDYLD);
-  LLDB_PLUGIN_TERMINATE(DynamicLoaderPOSIXDYLD);
+  LLDB_PLUGIN_TERMINATE(DynamicLoaderPosixDYLD);
   LLDB_PLUGIN_TERMINATE(DynamicLoaderWasmDYLD);
   LLDB_PLUGIN_TERMINATE(DynamicLoaderStatic);
   LLDB_PLUGIN_TERMINATE(DynamicLoaderWindowsDYLD);
@@ -323,7 +323,7 @@ void SystemInitializerTest::Terminate() {
   LLDB_PLUGIN_TERMINATE(ObjectFileWasm);
 
   LLDB_PLUGIN_TERMINATE(ObjectContainerBSDArchive);
-  LLDB_PLUGIN_TERMINATE(ObjectContainerUniversalMachO);
+  LLDB_PLUGIN_TERMINATE(ObjectContainerMachOArchive);
 
   LLDB_PLUGIN_TERMINATE(ScriptInterpreterNone);

More information about the lldb-commits mailing list