Commit 1d1ebb9e authored by Jonas Devlieghere's avatar Jonas Devlieghere
Browse files

[lldb/Initializers] Move all ObjC initializers into AppleObjCRuntime 

AppleObjCRuntime is the main entry point to the plugin with the same
name. This is part of a greater refactoring to auto generate the
initializers. NFC.

Differential revision: https://reviews.llvm.org/D73121
parent 7bdc83f3

lldb/source/API/SystemInitializerFull.cpp

+3 −6
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ 
#include "Plugins/Language/ObjC/ObjCLanguage.h"

#include "Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h"

#include "Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h"

#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h"

#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h"

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

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

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

#include "Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h"
@@ -244,8 +243,7 @@ llvm::Error SystemInitializerFull::Initialize() { 


  SymbolFileDWARFDebugMap::Initialize();

  ItaniumABILanguageRuntime::Initialize();

  AppleObjCRuntimeV2::Initialize();

  AppleObjCRuntimeV1::Initialize();

  AppleObjCRuntime::Initialize();

  SystemRuntimeMacOSX::Initialize();

  RenderScriptRuntime::Initialize();
@@ -338,8 +336,7 @@ void SystemInitializerFull::Terminate() { 


  SymbolFileDWARFDebugMap::Terminate();

  ItaniumABILanguageRuntime::Terminate();

  AppleObjCRuntimeV2::Terminate();

  AppleObjCRuntimeV1::Terminate();

  AppleObjCRuntime::Terminate();

  SystemRuntimeMacOSX::Terminate();

  RenderScriptRuntime::Terminate();

lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp

+17 −8
Original line number Diff line number Diff line
@@ -8,10 +8,12 @@ 
//===----------------------------------------------------------------------===//



#include "AppleObjCRuntime.h"

#include "AppleObjCRuntimeV1.h"

#include "AppleObjCRuntimeV2.h"

#include "AppleObjCTrampolineHandler.h"



#include "clang/AST/Type.h"



#include "Plugins/Language/ObjC/NSString.h"

#include "Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h"

#include "Plugins/Process/Utility/HistoryThread.h"

#include "lldb/Breakpoint/BreakpointLocation.h"

#include "lldb/Core/Module.h"

#include "lldb/Core/ModuleList.h"
@@ -35,10 +37,7 @@ 
#include "lldb/Utility/Scalar.h"

#include "lldb/Utility/Status.h"

#include "lldb/Utility/StreamString.h"



#include "Plugins/Process/Utility/HistoryThread.h"

#include "Plugins/Language/ObjC/NSString.h"

#include "Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h"

#include "clang/AST/Type.h"



#include <vector>
@@ -55,6 +54,16 @@ AppleObjCRuntime::AppleObjCRuntime(Process *process) 
  ReadObjCLibraryIfNeeded(process->GetTarget().GetImages());

}



void AppleObjCRuntime::Initialize() {

  AppleObjCRuntimeV2::Initialize();

  AppleObjCRuntimeV1::Initialize();

}



void AppleObjCRuntime::Terminate() {

  AppleObjCRuntimeV2::Terminate();

  AppleObjCRuntimeV1::Terminate();

}



bool AppleObjCRuntime::GetObjectDescription(Stream &str, ValueObject &valobj) {

  CompilerType compiler_type(valobj.GetCompilerType());

  bool is_signed;

lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h

+6 −2
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ public: 


  static char ID;



  static void Initialize();



  static void Terminate();



  bool isA(const void *ClassID) const override {

    return ClassID == &ID || ObjCLanguageRuntime::isA(ClassID);

  }

lldb/tools/lldb-test/SystemInitializerTest.cpp

+3 −6
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ 
#include "Plugins/Language/ObjC/ObjCLanguage.h"

#include "Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h"

#include "Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h"

#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h"

#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h"

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

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

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

#include "Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h"
@@ -215,8 +214,7 @@ llvm::Error SystemInitializerTest::Initialize() { 


  SymbolFileDWARFDebugMap::Initialize();

  ItaniumABILanguageRuntime::Initialize();

  AppleObjCRuntimeV2::Initialize();

  AppleObjCRuntimeV1::Initialize();

  AppleObjCRuntime::Initialize();

  SystemRuntimeMacOSX::Initialize();

  RenderScriptRuntime::Initialize();
@@ -308,8 +306,7 @@ void SystemInitializerTest::Terminate() { 


  SymbolFileDWARFDebugMap::Terminate();

  ItaniumABILanguageRuntime::Terminate();

  AppleObjCRuntimeV2::Terminate();

  AppleObjCRuntimeV1::Terminate();

  AppleObjCRuntime::Terminate();

  SystemRuntimeMacOSX::Terminate();

  RenderScriptRuntime::Terminate();