Author: Jonas Devlieghere Date: 2020-02-11T15:54:36-08:00 New Revision: 2d3ecade3892fb0d0713350e06522a94734733b7
URL: https://github.com/llvm/llvm-project/commit/2d3ecade3892fb0d0713350e06522a94734733b7 DIFF: https://github.com/llvm/llvm-project/commit/2d3ecade3892fb0d0713350e06522a94734733b7.diff LOG: [lldb/Plugins] Move PlatformRemoteiOS into PlatformMacOSX (NFCI) Move the logic for initialization and termination for PlatformRemoteiOS into PlatformMacOSX, like we did for the other Darwin platforms in a731c6ba94d0464c6a122de1af70ab88ffb5c1a6. Added: Modified: lldb/source/API/SystemInitializerFull.cpp lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp lldb/tools/lldb-test/SystemInitializerTest.cpp Removed: ################################################################################ diff --git a/lldb/source/API/SystemInitializerFull.cpp b/lldb/source/API/SystemInitializerFull.cpp index b14a9a2ccd28..cde820bbb76b 100644 --- a/lldb/source/API/SystemInitializerFull.cpp +++ b/lldb/source/API/SystemInitializerFull.cpp @@ -60,7 +60,6 @@ LLDB_PLUGIN_DECLARE(PlatformNetBSD); LLDB_PLUGIN_DECLARE(PlatformOpenBSD); LLDB_PLUGIN_DECLARE(PlatformWindows); LLDB_PLUGIN_DECLARE(PlatformAndroid); -LLDB_PLUGIN_DECLARE(PlatformRemoteiOS); LLDB_PLUGIN_DECLARE(PlatformMacOSX); LLDB_PLUGIN_DECLARE(TypeSystemClang); LLDB_PLUGIN_DECLARE(ArchitectureArm); @@ -187,7 +186,6 @@ llvm::Error SystemInitializerFull::Initialize() { LLDB_PLUGIN_INITIALIZE(PlatformOpenBSD); LLDB_PLUGIN_INITIALIZE(PlatformWindows); LLDB_PLUGIN_INITIALIZE(PlatformAndroid); - LLDB_PLUGIN_INITIALIZE(PlatformRemoteiOS); LLDB_PLUGIN_INITIALIZE(PlatformMacOSX); // Initialize LLVM and Clang @@ -363,7 +361,6 @@ void SystemInitializerFull::Terminate() { LLDB_PLUGIN_TERMINATE(PlatformOpenBSD); LLDB_PLUGIN_TERMINATE(PlatformWindows); LLDB_PLUGIN_TERMINATE(PlatformAndroid); - LLDB_PLUGIN_TERMINATE(PlatformRemoteiOS); LLDB_PLUGIN_TERMINATE(PlatformMacOSX); LLDB_PLUGIN_TERMINATE(ObjectFileBreakpad); diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp index 6cf96eded7aa..c62940f35e5c 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "PlatformMacOSX.h" +#include "PlatformRemoteiOS.h" #if defined(__APPLE__) #include "PlatformAppleTVSimulator.h" #include "PlatformAppleWatchSimulator.h" @@ -44,6 +45,7 @@ static uint32_t g_initialize_count = 0; void PlatformMacOSX::Initialize() { PlatformDarwin::Initialize(); + PlatformRemoteiOS::Initialize(); #if defined(__APPLE__) PlatformiOSSimulator::Initialize(); PlatformDarwinKernel::Initialize(); @@ -82,6 +84,7 @@ void PlatformMacOSX::Terminate() { PlatformDarwinKernel::Terminate(); PlatformiOSSimulator::Terminate(); #endif + PlatformRemoteiOS::Terminate(); PlatformDarwin::Terminate(); } diff --git a/lldb/tools/lldb-test/SystemInitializerTest.cpp b/lldb/tools/lldb-test/SystemInitializerTest.cpp index 3d8c80db5500..a9b4ba67c2ca 100644 --- a/lldb/tools/lldb-test/SystemInitializerTest.cpp +++ b/lldb/tools/lldb-test/SystemInitializerTest.cpp @@ -46,7 +46,6 @@ LLDB_PLUGIN_DECLARE(PlatformNetBSD); LLDB_PLUGIN_DECLARE(PlatformOpenBSD); LLDB_PLUGIN_DECLARE(PlatformWindows); LLDB_PLUGIN_DECLARE(PlatformAndroid); -LLDB_PLUGIN_DECLARE(PlatformRemoteiOS); LLDB_PLUGIN_DECLARE(PlatformMacOSX); LLDB_PLUGIN_DECLARE(TypeSystemClang); LLDB_PLUGIN_DECLARE(ArchitectureArm); @@ -162,7 +161,6 @@ llvm::Error SystemInitializerTest::Initialize() { LLDB_PLUGIN_INITIALIZE(PlatformOpenBSD); LLDB_PLUGIN_INITIALIZE(PlatformWindows); LLDB_PLUGIN_INITIALIZE(PlatformAndroid); - LLDB_PLUGIN_INITIALIZE(PlatformRemoteiOS); LLDB_PLUGIN_INITIALIZE(PlatformMacOSX); // Initialize LLVM and Clang @@ -338,7 +336,6 @@ void SystemInitializerTest::Terminate() { LLDB_PLUGIN_TERMINATE(PlatformOpenBSD); LLDB_PLUGIN_TERMINATE(PlatformWindows); LLDB_PLUGIN_TERMINATE(PlatformAndroid); - LLDB_PLUGIN_TERMINATE(PlatformRemoteiOS); LLDB_PLUGIN_TERMINATE(PlatformMacOSX); LLDB_PLUGIN_TERMINATE(ObjectFileBreakpad); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
