Skip to content

Commit c3ab790

Browse files
committed
[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.
1 parent 10b4aec commit c3ab790

File tree

1 file changed

+37
-7
lines changed

1 file changed

+37
-7
lines changed

lldb/tools/lldb-test/SystemInitializerTest.cpp

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h"
1919
#include "Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h"
2020
#include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h"
21+
#include "Plugins/ABI/SysV-arc/ABISysV_arc.h"
2122
#include "Plugins/ABI/SysV-arm/ABISysV_arm.h"
2223
#include "Plugins/ABI/SysV-arm64/ABISysV_arm64.h"
2324
#include "Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h"
@@ -30,14 +31,18 @@
3031
#include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h"
3132
#include "Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.h"
3233
#include "Plugins/Architecture/Arm/ArchitectureArm.h"
34+
#include "Plugins/Architecture/Mips/ArchitectureMips.h"
3335
#include "Plugins/Architecture/PPC64/ArchitecturePPC64.h"
3436
#include "Plugins/Disassembler/llvm/DisassemblerLLVMC.h"
3537
#include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.h"
3638
#include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h"
3739
#include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h"
3840
#include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h"
3941
#include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h"
42+
#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
4043
#include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h"
44+
#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"
45+
#include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"
4146
#include "Plugins/Instruction/PPC64/EmulateInstructionPPC64.h"
4247
#include "Plugins/InstrumentationRuntime/ASan/ASanRuntime.h"
4348
#include "Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.h"
@@ -52,6 +57,8 @@
5257
#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h"
5358
#include "Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h"
5459
#include "Plugins/MemoryHistory/asan/MemoryHistoryASan.h"
60+
#include "Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h"
61+
#include "Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h"
5562
#include "Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h"
5663
#include "Plugins/ObjectFile/ELF/ObjectFileELF.h"
5764
#include "Plugins/ObjectFile/Mach-O/ObjectFileMachO.h"
@@ -68,6 +75,7 @@
6875
#include "Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h"
6976
#include "Plugins/Process/elf-core/ProcessElfCore.h"
7077
#include "Plugins/Process/gdb-remote/ProcessGDBRemote.h"
78+
#include "Plugins/Process/mach-core/ProcessMachCore.h"
7179
#include "Plugins/Process/minidump/ProcessMinidump.h"
7280
#include "Plugins/ScriptInterpreter/None/ScriptInterpreterNone.h"
7381
#include "Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h"
@@ -86,11 +94,11 @@
8694
#include "Plugins/Platform/MacOSX/PlatformAppleTVSimulator.h"
8795
#include "Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.h"
8896
#include "Plugins/Platform/MacOSX/PlatformDarwinKernel.h"
97+
#include "Plugins/Platform/MacOSX/PlatformRemoteAppleBridge.h"
8998
#include "Plugins/Platform/MacOSX/PlatformRemoteAppleTV.h"
9099
#include "Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.h"
91100
#include "Plugins/Platform/MacOSX/PlatformiOSSimulator.h"
92101
#include "Plugins/Process/MacOSX-Kernel/ProcessKDP.h"
93-
#include "Plugins/Process/mach-core/ProcessMachCore.h"
94102
#include "Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h"
95103
#endif
96104
#include "Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.h"
@@ -156,8 +164,10 @@ llvm::Error SystemInitializerTest::Initialize() {
156164
ObjectFilePECOFF::Initialize();
157165
wasm::ObjectFileWasm::Initialize();
158166

159-
ScriptInterpreterNone::Initialize();
167+
ObjectContainerBSDArchive::Initialize();
168+
ObjectContainerUniversalMachO::Initialize();
160169

170+
ScriptInterpreterNone::Initialize();
161171

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

186196
ArchitectureArm::Initialize();
197+
ArchitectureMips::Initialize();
187198
ArchitecturePPC64::Initialize();
188199

189200
DisassemblerLLVMC::Initialize();
190201

191202
JITLoaderGDB::Initialize();
192203
ProcessElfCore::Initialize();
204+
ProcessMachCore::Initialize();
193205
minidump::ProcessMinidump::Initialize();
194206
MemoryHistoryASan::Initialize();
195207
AddressSanitizerRuntime::Initialize();
@@ -205,8 +217,13 @@ llvm::Error SystemInitializerTest::Initialize() {
205217
wasm::SymbolVendorWasm::Initialize();
206218
UnwindAssemblyInstEmulation::Initialize();
207219
UnwindAssembly_x86::Initialize();
220+
221+
EmulateInstructionARM::Initialize();
208222
EmulateInstructionARM64::Initialize();
223+
EmulateInstructionMIPS::Initialize();
224+
EmulateInstructionMIPS64::Initialize();
209225
EmulateInstructionPPC64::Initialize();
226+
210227
SymbolFileDWARFDebugMap::Initialize();
211228
ItaniumABILanguageRuntime::Initialize();
212229
AppleObjCRuntimeV2::Initialize();
@@ -227,16 +244,16 @@ llvm::Error SystemInitializerTest::Initialize() {
227244
#if defined(__APPLE__)
228245
SymbolVendorMacOSX::Initialize();
229246
ProcessKDP::Initialize();
230-
ProcessMachCore::Initialize();
231247
PlatformAppleTVSimulator::Initialize();
232248
PlatformAppleWatchSimulator::Initialize();
233249
PlatformRemoteAppleTV::Initialize();
234250
PlatformRemoteAppleWatch::Initialize();
251+
PlatformRemoteAppleBridge::Initialize();
235252
DynamicLoaderDarwinKernel::Initialize();
236253
#endif
237254

238-
// This plugin is valid on any host that talks to a Darwin remote.
239-
// It shouldn't be limited to __APPLE__.
255+
// This plugin is valid on any host that talks to a Darwin remote. It
256+
// shouldn't be limited to __APPLE__.
240257
StructuredDataDarwinLog::Initialize();
241258

242259
// Platform agnostic plugins
@@ -272,29 +289,39 @@ void SystemInitializerTest::Terminate() {
272289

273290
ClangASTContext::Terminate();
274291

292+
ArchitectureArm::Terminate();
293+
ArchitectureMips::Terminate();
294+
ArchitecturePPC64::Terminate();
295+
275296
#define LLVM_TARGET(t) LLDB_PROCESS_ ## t(Terminate)
276297
#include "llvm/Config/Targets.def"
277298

278299
DisassemblerLLVMC::Terminate();
279300

280301
JITLoaderGDB::Terminate();
281302
ProcessElfCore::Terminate();
303+
ProcessMachCore::Terminate();
282304
minidump::ProcessMinidump::Terminate();
283305
MemoryHistoryASan::Terminate();
284306
AddressSanitizerRuntime::Terminate();
285307
ThreadSanitizerRuntime::Terminate();
286308
UndefinedBehaviorSanitizerRuntime::Terminate();
287309
MainThreadCheckerRuntime::Terminate();
310+
wasm::SymbolVendorWasm::Terminate();
288311
SymbolVendorELF::Terminate();
289312
breakpad::SymbolFileBreakpad::Terminate();
290313
SymbolFileDWARF::Terminate();
291314
SymbolFilePDB::Terminate();
292315
SymbolFileSymtab::Terminate();
293-
wasm::SymbolVendorWasm::Terminate();
294316
UnwindAssembly_x86::Terminate();
295317
UnwindAssemblyInstEmulation::Terminate();
318+
319+
EmulateInstructionARM::Terminate();
296320
EmulateInstructionARM64::Terminate();
321+
EmulateInstructionMIPS::Terminate();
322+
EmulateInstructionMIPS64::Terminate();
297323
EmulateInstructionPPC64::Terminate();
324+
298325
SymbolFileDWARFDebugMap::Terminate();
299326
ItaniumABILanguageRuntime::Terminate();
300327
AppleObjCRuntimeV2::Terminate();
@@ -308,13 +335,13 @@ void SystemInitializerTest::Terminate() {
308335

309336
#if defined(__APPLE__)
310337
DynamicLoaderDarwinKernel::Terminate();
311-
ProcessMachCore::Terminate();
312338
ProcessKDP::Terminate();
313339
SymbolVendorMacOSX::Terminate();
314340
PlatformAppleTVSimulator::Terminate();
315341
PlatformAppleWatchSimulator::Terminate();
316342
PlatformRemoteAppleTV::Terminate();
317343
PlatformRemoteAppleWatch::Terminate();
344+
PlatformRemoteAppleBridge::Terminate();
318345
#endif
319346

320347
#if defined(__FreeBSD__)
@@ -352,6 +379,9 @@ void SystemInitializerTest::Terminate() {
352379
ObjectFilePECOFF::Terminate();
353380
wasm::ObjectFileWasm::Terminate();
354381

382+
ObjectContainerBSDArchive::Terminate();
383+
ObjectContainerUniversalMachO::Terminate();
384+
355385
// Now shutdown the common parts, in reverse order.
356386
SystemInitializerCommon::Terminate();
357387
}

0 commit comments

Comments
 (0)