Commit c3ab790c authored by Raphael Isemann's avatar Raphael Isemann
Browse files

[lldb][NFC] Resynchronize Init/Terminate calls in SystemInitializerFull/Test.cpp files. 

These files should do the more or less the same initialize/terminate calls in the
same order. This just reverts all the differences that have piled up over time
in the SystemInitializerTest that people keep forgetting about.
parent 10b4aece

lldb/tools/lldb-test/SystemInitializerTest.cpp

+37 −7
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h"

#include "Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h"

#include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h"

#include "Plugins/ABI/SysV-arc/ABISysV_arc.h"

#include "Plugins/ABI/SysV-arm/ABISysV_arm.h"

#include "Plugins/ABI/SysV-arm64/ABISysV_arm64.h"

#include "Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h"
@@ -30,6 +31,7 @@ 
#include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h"

#include "Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.h"

#include "Plugins/Architecture/Arm/ArchitectureArm.h"

#include "Plugins/Architecture/Mips/ArchitectureMips.h"

#include "Plugins/Architecture/PPC64/ArchitecturePPC64.h"

#include "Plugins/Disassembler/llvm/DisassemblerLLVMC.h"

#include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.h"
@@ -37,7 +39,10 @@ 
#include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h"

#include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h"

#include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h"

#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"

#include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h"

#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"

#include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"

#include "Plugins/Instruction/PPC64/EmulateInstructionPPC64.h"

#include "Plugins/InstrumentationRuntime/ASan/ASanRuntime.h"

#include "Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.h"
@@ -52,6 +57,8 @@ 
#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h"

#include "Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h"

#include "Plugins/MemoryHistory/asan/MemoryHistoryASan.h"

#include "Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h"

#include "Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h"

#include "Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h"

#include "Plugins/ObjectFile/ELF/ObjectFileELF.h"

#include "Plugins/ObjectFile/Mach-O/ObjectFileMachO.h"
@@ -68,6 +75,7 @@ 
#include "Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h"

#include "Plugins/Process/elf-core/ProcessElfCore.h"

#include "Plugins/Process/gdb-remote/ProcessGDBRemote.h"

#include "Plugins/Process/mach-core/ProcessMachCore.h"

#include "Plugins/Process/minidump/ProcessMinidump.h"

#include "Plugins/ScriptInterpreter/None/ScriptInterpreterNone.h"

#include "Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h"
@@ -86,11 +94,11 @@ 
#include "Plugins/Platform/MacOSX/PlatformAppleTVSimulator.h"

#include "Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.h"

#include "Plugins/Platform/MacOSX/PlatformDarwinKernel.h"

#include "Plugins/Platform/MacOSX/PlatformRemoteAppleBridge.h"

#include "Plugins/Platform/MacOSX/PlatformRemoteAppleTV.h"

#include "Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.h"

#include "Plugins/Platform/MacOSX/PlatformiOSSimulator.h"

#include "Plugins/Process/MacOSX-Kernel/ProcessKDP.h"

#include "Plugins/Process/mach-core/ProcessMachCore.h"

#include "Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h"

#endif

#include "Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.h"
@@ -156,8 +164,10 @@ llvm::Error SystemInitializerTest::Initialize() { 
  ObjectFilePECOFF::Initialize();

  wasm::ObjectFileWasm::Initialize();



  ScriptInterpreterNone::Initialize();

  ObjectContainerBSDArchive::Initialize();

  ObjectContainerUniversalMachO::Initialize();



  ScriptInterpreterNone::Initialize();



  platform_freebsd::PlatformFreeBSD::Initialize();

  platform_linux::PlatformLinux::Initialize();
@@ -184,12 +194,14 @@ llvm::Error SystemInitializerTest::Initialize() { 
#include "llvm/Config/Targets.def"



  ArchitectureArm::Initialize();

  ArchitectureMips::Initialize();

  ArchitecturePPC64::Initialize();



  DisassemblerLLVMC::Initialize();



  JITLoaderGDB::Initialize();

  ProcessElfCore::Initialize();

  ProcessMachCore::Initialize();

  minidump::ProcessMinidump::Initialize();

  MemoryHistoryASan::Initialize();

  AddressSanitizerRuntime::Initialize();
@@ -205,8 +217,13 @@ llvm::Error SystemInitializerTest::Initialize() { 
  wasm::SymbolVendorWasm::Initialize();

  UnwindAssemblyInstEmulation::Initialize();

  UnwindAssembly_x86::Initialize();



  EmulateInstructionARM::Initialize();

  EmulateInstructionARM64::Initialize();

  EmulateInstructionMIPS::Initialize();

  EmulateInstructionMIPS64::Initialize();

  EmulateInstructionPPC64::Initialize();



  SymbolFileDWARFDebugMap::Initialize();

  ItaniumABILanguageRuntime::Initialize();

  AppleObjCRuntimeV2::Initialize();
@@ -227,16 +244,16 @@ llvm::Error SystemInitializerTest::Initialize() { 
#if defined(__APPLE__)

  SymbolVendorMacOSX::Initialize();

  ProcessKDP::Initialize();

  ProcessMachCore::Initialize();

  PlatformAppleTVSimulator::Initialize();

  PlatformAppleWatchSimulator::Initialize();

  PlatformRemoteAppleTV::Initialize();

  PlatformRemoteAppleWatch::Initialize();

  PlatformRemoteAppleBridge::Initialize();

  DynamicLoaderDarwinKernel::Initialize();

#endif



  // This plugin is valid on any host that talks to a Darwin remote.

  // It shouldn't be limited to __APPLE__.

  // This plugin is valid on any host that talks to a Darwin remote. It

  // shouldn't be limited to __APPLE__.

  StructuredDataDarwinLog::Initialize();



  // Platform agnostic plugins
@@ -272,6 +289,10 @@ void SystemInitializerTest::Terminate() { 


  ClangASTContext::Terminate();



  ArchitectureArm::Terminate();

  ArchitectureMips::Terminate();

  ArchitecturePPC64::Terminate();



#define LLVM_TARGET(t) LLDB_PROCESS_ ## t(Terminate)

#include "llvm/Config/Targets.def"
@@ -279,22 +300,28 @@ void SystemInitializerTest::Terminate() { 


  JITLoaderGDB::Terminate();

  ProcessElfCore::Terminate();

  ProcessMachCore::Terminate();

  minidump::ProcessMinidump::Terminate();

  MemoryHistoryASan::Terminate();

  AddressSanitizerRuntime::Terminate();

  ThreadSanitizerRuntime::Terminate();

  UndefinedBehaviorSanitizerRuntime::Terminate();

  MainThreadCheckerRuntime::Terminate();

  wasm::SymbolVendorWasm::Terminate();

  SymbolVendorELF::Terminate();

  breakpad::SymbolFileBreakpad::Terminate();

  SymbolFileDWARF::Terminate();

  SymbolFilePDB::Terminate();

  SymbolFileSymtab::Terminate();

  wasm::SymbolVendorWasm::Terminate();

  UnwindAssembly_x86::Terminate();

  UnwindAssemblyInstEmulation::Terminate();



  EmulateInstructionARM::Terminate();

  EmulateInstructionARM64::Terminate();

  EmulateInstructionMIPS::Terminate();

  EmulateInstructionMIPS64::Terminate();

  EmulateInstructionPPC64::Terminate();



  SymbolFileDWARFDebugMap::Terminate();

  ItaniumABILanguageRuntime::Terminate();

  AppleObjCRuntimeV2::Terminate();
@@ -308,13 +335,13 @@ void SystemInitializerTest::Terminate() { 


#if defined(__APPLE__)

  DynamicLoaderDarwinKernel::Terminate();

  ProcessMachCore::Terminate();

  ProcessKDP::Terminate();

  SymbolVendorMacOSX::Terminate();

  PlatformAppleTVSimulator::Terminate();

  PlatformAppleWatchSimulator::Terminate();

  PlatformRemoteAppleTV::Terminate();

  PlatformRemoteAppleWatch::Terminate();

  PlatformRemoteAppleBridge::Terminate();

#endif



#if defined(__FreeBSD__)
@@ -352,6 +379,9 @@ void SystemInitializerTest::Terminate() { 
  ObjectFilePECOFF::Terminate();

  wasm::ObjectFileWasm::Terminate();



  ObjectContainerBSDArchive::Terminate();

  ObjectContainerUniversalMachO::Terminate();



  // Now shutdown the common parts, in reverse order.

  SystemInitializerCommon::Terminate();

}