Commit 6e30fd05 authored by Jonas Devlieghere's avatar Jonas Devlieghere
Browse files

[lldb/Plugins] Move DynamicLoaderMacOS into DynamicLoaderMacOSXDYLD (NFCI) 

Move the logic for initialization and termination for DynamicLoaderMacOS
into DynamicLoaderMacOSXDYLD so that there's one initializer for the
DynamicLoaderMacOSXDYLD plugin.
parent 4f865b77

lldb/source/API/SystemInitializerFull.cpp

+0 −3
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ LLDB_PLUGIN_DECLARE(StructuredDataDarwinLog) 
LLDB_PLUGIN_DECLARE(PlatformRemoteGDBServer)

LLDB_PLUGIN_DECLARE(ProcessGDBRemote)

LLDB_PLUGIN_DECLARE(DynamicLoaderMacOSXDYLD)

LLDB_PLUGIN_DECLARE(DynamicLoaderMacOS)

LLDB_PLUGIN_DECLARE(DynamicLoaderPOSIXDYLD)

LLDB_PLUGIN_DECLARE(DynamicLoaderStatic)

LLDB_PLUGIN_DECLARE(DynamicLoaderWindowsDYLD)
@@ -259,7 +258,6 @@ llvm::Error SystemInitializerFull::Initialize() { 


  LLDB_PLUGIN_INITIALIZE(ProcessGDBRemote);

  LLDB_PLUGIN_INITIALIZE(DynamicLoaderMacOSXDYLD);

  LLDB_PLUGIN_INITIALIZE(DynamicLoaderMacOS);

  LLDB_PLUGIN_INITIALIZE(DynamicLoaderPOSIXDYLD);

  LLDB_PLUGIN_INITIALIZE(DynamicLoaderStatic);

  LLDB_PLUGIN_INITIALIZE(DynamicLoaderWindowsDYLD);
@@ -347,7 +345,6 @@ void SystemInitializerFull::Terminate() { 
  LLDB_PLUGIN_TERMINATE(StructuredDataDarwinLog);



  LLDB_PLUGIN_TERMINATE(DynamicLoaderMacOSXDYLD);

  LLDB_PLUGIN_TERMINATE(DynamicLoaderMacOS);

  LLDB_PLUGIN_TERMINATE(DynamicLoaderPOSIXDYLD);

  LLDB_PLUGIN_TERMINATE(DynamicLoaderStatic);

  LLDB_PLUGIN_TERMINATE(DynamicLoaderWindowsDYLD);

lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOS.cpp

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
using namespace lldb;

using namespace lldb_private;



LLDB_PLUGIN(DynamicLoaderMacOS)



// Create an instance of this class. This function is filled into the plugin

// info class that gets handed out by the plugin factory and allows the lldb to

// instantiate an instance of this class.

lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp

+7 −6
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ 
//

//===----------------------------------------------------------------------===//



#include "DynamicLoaderMacOSXDYLD.h"

#include "DynamicLoaderDarwin.h"

#include "DynamicLoaderMacOS.h"

#include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h"

#include "Plugins/TypeSystem/Clang/TypeSystemClang.h"

#include "lldb/Breakpoint/StoppointCallbackContext.h"

#include "lldb/Core/Debugger.h"

#include "lldb/Core/Module.h"
@@ -25,12 +30,6 @@ 
#include "lldb/Utility/Log.h"

#include "lldb/Utility/State.h"



#include "DynamicLoaderDarwin.h"

#include "DynamicLoaderMacOSXDYLD.h"



#include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h"

#include "Plugins/TypeSystem/Clang/TypeSystemClang.h"



//#define ENABLE_DEBUG_PRINTF // COMMENT THIS LINE OUT PRIOR TO CHECKIN

#ifdef ENABLE_DEBUG_PRINTF

#include <stdio.h>
@@ -1123,9 +1122,11 @@ bool DynamicLoaderMacOSXDYLD::GetSharedCacheInformation( 
void DynamicLoaderMacOSXDYLD::Initialize() {

  PluginManager::RegisterPlugin(GetPluginNameStatic(),

                                GetPluginDescriptionStatic(), CreateInstance);

  DynamicLoaderMacOS::Initialize();

}



void DynamicLoaderMacOSXDYLD::Terminate() {

  DynamicLoaderMacOS::Terminate();

  PluginManager::UnregisterPlugin(CreateInstance);

}

lldb/tools/lldb-test/SystemInitializerTest.cpp

+0 −3
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ LLDB_PLUGIN_DECLARE(StructuredDataDarwinLog) 
LLDB_PLUGIN_DECLARE(PlatformRemoteGDBServer)

LLDB_PLUGIN_DECLARE(ProcessGDBRemote)

LLDB_PLUGIN_DECLARE(DynamicLoaderMacOSXDYLD)

LLDB_PLUGIN_DECLARE(DynamicLoaderMacOS)

LLDB_PLUGIN_DECLARE(DynamicLoaderPOSIXDYLD)

LLDB_PLUGIN_DECLARE(DynamicLoaderStatic)

LLDB_PLUGIN_DECLARE(DynamicLoaderWindowsDYLD)
@@ -234,7 +233,6 @@ llvm::Error SystemInitializerTest::Initialize() { 


  LLDB_PLUGIN_INITIALIZE(ProcessGDBRemote);

  LLDB_PLUGIN_INITIALIZE(DynamicLoaderMacOSXDYLD);

  LLDB_PLUGIN_INITIALIZE(DynamicLoaderMacOS);

  LLDB_PLUGIN_INITIALIZE(DynamicLoaderPOSIXDYLD);

  LLDB_PLUGIN_INITIALIZE(DynamicLoaderStatic);

  LLDB_PLUGIN_INITIALIZE(DynamicLoaderWindowsDYLD);
@@ -322,7 +320,6 @@ void SystemInitializerTest::Terminate() { 
  LLDB_PLUGIN_TERMINATE(StructuredDataDarwinLog);



  LLDB_PLUGIN_TERMINATE(DynamicLoaderMacOSXDYLD);

  LLDB_PLUGIN_TERMINATE(DynamicLoaderMacOS);

  LLDB_PLUGIN_TERMINATE(DynamicLoaderPOSIXDYLD);

  LLDB_PLUGIN_TERMINATE(DynamicLoaderStatic);

  LLDB_PLUGIN_TERMINATE(DynamicLoaderWindowsDYLD);