Author: Jonas Devlieghere Date: 2020-02-18T10:32:06-08:00 New Revision: 884a58948b1a666910dcf1408d3d792fbd486012
URL: https://github.com/llvm/llvm-project/commit/884a58948b1a666910dcf1408d3d792fbd486012 DIFF: https://github.com/llvm/llvm-project/commit/884a58948b1a666910dcf1408d3d792fbd486012.diff LOG: [lldb/Plugin] Unconditionally initialize DynamicLoaderDarwinKernel Other plugins depend on DynamicLoaderDarwinKernel and which means we cannot conditionally enable/build this plugin based on the target platform. This means that it will be past of the list of plugins initialized once that's autogenerated. Added: Modified: lldb/source/API/SystemInitializerFull.cpp lldb/tools/lldb-test/SystemInitializerTest.cpp Removed: ################################################################################ diff --git a/lldb/source/API/SystemInitializerFull.cpp b/lldb/source/API/SystemInitializerFull.cpp index 4593bd3e0c43..21a00cb8c79e 100644 --- a/lldb/source/API/SystemInitializerFull.cpp +++ b/lldb/source/API/SystemInitializerFull.cpp @@ -98,11 +98,11 @@ LLDB_PLUGIN_DECLARE(ProcessFreeBSD) #if defined(__APPLE__) LLDB_PLUGIN_DECLARE(SymbolVendorMacOSX) LLDB_PLUGIN_DECLARE(ProcessMacOSXKernel) -LLDB_PLUGIN_DECLARE(DynamicLoaderDarwinKernel) #endif LLDB_PLUGIN_DECLARE(StructuredDataDarwinLog) LLDB_PLUGIN_DECLARE(PlatformGDB) LLDB_PLUGIN_DECLARE(ProcessGDBRemote) +LLDB_PLUGIN_DECLARE(DynamicLoaderDarwinKernel) LLDB_PLUGIN_DECLARE(DynamicLoaderHexagonDYLD) LLDB_PLUGIN_DECLARE(DynamicLoaderMacOSXDYLD) LLDB_PLUGIN_DECLARE(DynamicLoaderPosixDYLD) @@ -231,7 +231,6 @@ llvm::Error SystemInitializerFull::Initialize() { #if defined(__APPLE__) LLDB_PLUGIN_INITIALIZE(SymbolVendorMacOSX); LLDB_PLUGIN_INITIALIZE(ProcessMacOSXKernel); - LLDB_PLUGIN_INITIALIZE(DynamicLoaderDarwinKernel); #endif // This plugin is valid on any host that talks to a Darwin remote. It @@ -240,14 +239,15 @@ llvm::Error SystemInitializerFull::Initialize() { // Platform agnostic plugins LLDB_PLUGIN_INITIALIZE(PlatformGDB); - LLDB_PLUGIN_INITIALIZE(ProcessGDBRemote); + + LLDB_PLUGIN_INITIALIZE(DynamicLoaderDarwinKernel); LLDB_PLUGIN_INITIALIZE(DynamicLoaderHexagonDYLD); LLDB_PLUGIN_INITIALIZE(DynamicLoaderMacOSXDYLD); LLDB_PLUGIN_INITIALIZE(DynamicLoaderPosixDYLD); LLDB_PLUGIN_INITIALIZE(DynamicLoaderWasmDYLD); // Before DynamicLoaderStatic. - LLDB_PLUGIN_INITIALIZE(DynamicLoaderStatic); LLDB_PLUGIN_INITIALIZE(DynamicLoaderWindowsDYLD); + LLDB_PLUGIN_INITIALIZE(DynamicLoaderStatic); // Scan for any system or user LLDB plug-ins PluginManager::Initialize(); @@ -317,7 +317,6 @@ void SystemInitializerFull::Terminate() { LLDB_PLUGIN_TERMINATE(ObjCPlusPlusLanguage); #if defined(__APPLE__) - LLDB_PLUGIN_TERMINATE(DynamicLoaderDarwinKernel); LLDB_PLUGIN_TERMINATE(ProcessMacOSXKernel); LLDB_PLUGIN_TERMINATE(SymbolVendorMacOSX); #endif @@ -331,12 +330,13 @@ void SystemInitializerFull::Terminate() { LLDB_PLUGIN_TERMINATE(ProcessGDBRemote); LLDB_PLUGIN_TERMINATE(StructuredDataDarwinLog); + LLDB_PLUGIN_TERMINATE(DynamicLoaderDarwinKernel); LLDB_PLUGIN_TERMINATE(DynamicLoaderHexagonDYLD); LLDB_PLUGIN_TERMINATE(DynamicLoaderMacOSXDYLD); LLDB_PLUGIN_TERMINATE(DynamicLoaderPosixDYLD); LLDB_PLUGIN_TERMINATE(DynamicLoaderWasmDYLD); - LLDB_PLUGIN_TERMINATE(DynamicLoaderStatic); LLDB_PLUGIN_TERMINATE(DynamicLoaderWindowsDYLD); + LLDB_PLUGIN_TERMINATE(DynamicLoaderStatic); LLDB_PLUGIN_TERMINATE(PlatformFreeBSD); LLDB_PLUGIN_TERMINATE(PlatformLinux); diff --git a/lldb/tools/lldb-test/SystemInitializerTest.cpp b/lldb/tools/lldb-test/SystemInitializerTest.cpp index bc5d119a30a1..1a3bf612674d 100644 --- a/lldb/tools/lldb-test/SystemInitializerTest.cpp +++ b/lldb/tools/lldb-test/SystemInitializerTest.cpp @@ -84,11 +84,11 @@ LLDB_PLUGIN_DECLARE(ProcessFreeBSD) #if defined(__APPLE__) LLDB_PLUGIN_DECLARE(SymbolVendorMacOSX) LLDB_PLUGIN_DECLARE(ProcessMacOSXKernel) -LLDB_PLUGIN_DECLARE(DynamicLoaderDarwinKernel) #endif LLDB_PLUGIN_DECLARE(StructuredDataDarwinLog) LLDB_PLUGIN_DECLARE(PlatformGDB) LLDB_PLUGIN_DECLARE(ProcessGDBRemote) +LLDB_PLUGIN_DECLARE(DynamicLoaderDarwinKernel) LLDB_PLUGIN_DECLARE(DynamicLoaderHexagonDYLD) LLDB_PLUGIN_DECLARE(DynamicLoaderMacOSXDYLD) LLDB_PLUGIN_DECLARE(DynamicLoaderPosixDYLD) @@ -206,7 +206,6 @@ llvm::Error SystemInitializerTest::Initialize() { #if defined(__APPLE__) LLDB_PLUGIN_INITIALIZE(SymbolVendorMacOSX); LLDB_PLUGIN_INITIALIZE(ProcessMacOSXKernel); - LLDB_PLUGIN_INITIALIZE(DynamicLoaderDarwinKernel); #endif // This plugin is valid on any host that talks to a Darwin remote. It @@ -215,14 +214,15 @@ llvm::Error SystemInitializerTest::Initialize() { // Platform agnostic plugins LLDB_PLUGIN_INITIALIZE(PlatformGDB); - LLDB_PLUGIN_INITIALIZE(ProcessGDBRemote); + + LLDB_PLUGIN_INITIALIZE(DynamicLoaderDarwinKernel); LLDB_PLUGIN_INITIALIZE(DynamicLoaderHexagonDYLD); LLDB_PLUGIN_INITIALIZE(DynamicLoaderMacOSXDYLD); LLDB_PLUGIN_INITIALIZE(DynamicLoaderPosixDYLD); LLDB_PLUGIN_INITIALIZE(DynamicLoaderWasmDYLD); // Before DynamicLoaderStatic. - LLDB_PLUGIN_INITIALIZE(DynamicLoaderStatic); LLDB_PLUGIN_INITIALIZE(DynamicLoaderWindowsDYLD); + LLDB_PLUGIN_INITIALIZE(DynamicLoaderStatic); // Scan for any system or user LLDB plug-ins PluginManager::Initialize(); @@ -292,7 +292,6 @@ void SystemInitializerTest::Terminate() { LLDB_PLUGIN_TERMINATE(ObjCPlusPlusLanguage); #if defined(__APPLE__) - LLDB_PLUGIN_TERMINATE(DynamicLoaderDarwinKernel); LLDB_PLUGIN_TERMINATE(ProcessMacOSXKernel); LLDB_PLUGIN_TERMINATE(SymbolVendorMacOSX); #endif @@ -306,12 +305,13 @@ void SystemInitializerTest::Terminate() { LLDB_PLUGIN_TERMINATE(ProcessGDBRemote); LLDB_PLUGIN_TERMINATE(StructuredDataDarwinLog); + LLDB_PLUGIN_TERMINATE(DynamicLoaderDarwinKernel); LLDB_PLUGIN_TERMINATE(DynamicLoaderHexagonDYLD); LLDB_PLUGIN_TERMINATE(DynamicLoaderMacOSXDYLD); LLDB_PLUGIN_TERMINATE(DynamicLoaderPosixDYLD); LLDB_PLUGIN_TERMINATE(DynamicLoaderWasmDYLD); - LLDB_PLUGIN_TERMINATE(DynamicLoaderStatic); LLDB_PLUGIN_TERMINATE(DynamicLoaderWindowsDYLD); + LLDB_PLUGIN_TERMINATE(DynamicLoaderStatic); LLDB_PLUGIN_TERMINATE(PlatformFreeBSD); LLDB_PLUGIN_TERMINATE(PlatformLinux); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
