Initialization: remove ObjectContainer from Common

[compnerd]

Summary

This restructures the initialization path to move the ObjectContainer
initialization into the *full* initialization path. This is not needed
for the lldb-server initialization path. This helps strip off ~1MiB
from the binary.

[xiaobai]

source/API/CMakeLists.txt

99–100

These should get sucked into LLDB_ALL_PLUGINS right?

[xiaobai]

source/API/SystemInitializerFull.cpp

132–133

You need to include the headers for these classes

[labath]

source/API/CMakeLists.txt

99–100

Yes, they will be.

source/API/SystemInitializerFull.cpp

132–133

And remove them from SystemInitializerCommon.h

[compnerd]

address feedback

source/API/SystemInitializerFull.cpp

132–133

They never were in SystemInitializerCommon.h

[labath]

source/API/SystemInitializerFull.cpp

132–133

they are in SystemInitializerCommon.cpp (sorry, I typed the file name by memory, didn't double check). Please remove the include from there, and this is good.

[compnerd]

SVN r359810

source/API/CMakeLists.txt

LINK_LIBS
     lldbDataFormatters
     lldbExpression
     lldbHost
     lldbInitialization
     lldbInterpreter
     lldbSymbol
     lldbTarget
     lldbUtility
+    lldbPluginObjectContainerBSDArchive
+    lldbPluginObjectContainerMachOArchive
     ${LLDB_ALL_PLUGINS}
   LINK_COMPONENTS
     Support
   )
 
 if (MSVC)
   set_source_files_properties(SBReproducer.cpp PROPERTIES COMPILE_FLAGS /bigobj)
 endif()

source/API/SystemInitializerFull.cpp

llvm::Error SystemInitializerFull::Initialize() {
   if (auto e = SystemInitializerCommon::Initialize())
     return e;
 
   breakpad::ObjectFileBreakpad::Initialize();
   ObjectFileELF::Initialize();
   ObjectFileMachO::Initialize();
   ObjectFilePECOFF::Initialize();
 
+  ObjectContainerBSDArchive::Initialize();
+  ObjectContainerUniversalMachO::Initialize();
+
   ScriptInterpreterNone::Initialize();
 
 #ifndef LLDB_DISABLE_PYTHON
   OperatingSystemPython::Initialize();
 #endif
 
 #if !defined(LLDB_DISABLE_PYTHON)
   ScriptInterpreterPython::Initialize();
#endif
   platform_android::PlatformAndroid::Terminate();
   PlatformMacOSX::Terminate();
   PlatformRemoteiOS::Terminate();
 #if defined(__APPLE__)
   PlatformiOSSimulator::Terminate();
   PlatformDarwinKernel::Terminate();
 #endif
 
+  ObjectContainerBSDArchive::Terminate();
+  ObjectContainerUniversalMachO::Terminate();
+
   breakpad::ObjectFileBreakpad::Terminate();
   ObjectFileELF::Terminate();
   ObjectFileMachO::Terminate();
   ObjectFilePECOFF::Terminate();
 
   // Now shutdown the common parts, in reverse order.
   SystemInitializerCommon::Terminate();
 }

source/Initialization/CMakeLists.txt

add_lldb_library(lldbInitialization
   SystemLifetimeManager.cpp
 
   LINK_LIBS
     lldbCore
     lldbHost
     lldbPluginInstructionARM
     lldbPluginInstructionMIPS
     lldbPluginInstructionMIPS64
-    lldbPluginObjectContainerBSDArchive
-    lldbPluginObjectContainerMachOArchive
     lldbPluginProcessGDBRemote
     ${EXTRA_PLUGINS}
     ${LLDB_SYSTEM_LIBS}
   LINK_COMPONENTS
     Support
   )

source/Initialization/SystemInitializerCommon.cpp

if (error)
     return error;
 
   static Timer::Category func_cat(LLVM_PRETTY_FUNCTION);
   Timer scoped_timer(func_cat, LLVM_PRETTY_FUNCTION);
 
   process_gdb_remote::ProcessGDBRemoteLog::Initialize();
 
   // Initialize plug-ins
-  ObjectContainerBSDArchive::Initialize();
-
   EmulateInstructionARM::Initialize();
   EmulateInstructionMIPS::Initialize();
   EmulateInstructionMIPS64::Initialize();
 
-  // Apple/Darwin hosted plugins
-  ObjectContainerUniversalMachO::Initialize();
-
 #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
   ProcessPOSIXLog::Initialize();
 #endif
 #if defined(_MSC_VER)
   ProcessWindowsLog::Initialize();
 #endif
 
   return llvm::Error::success();
 }
 
 void SystemInitializerCommon::Terminate() {
   static Timer::Category func_cat(LLVM_PRETTY_FUNCTION);
   Timer scoped_timer(func_cat, LLVM_PRETTY_FUNCTION);
-  ObjectContainerBSDArchive::Terminate();
 
   EmulateInstructionARM::Terminate();
   EmulateInstructionMIPS::Terminate();
   EmulateInstructionMIPS64::Terminate();
 
-  ObjectContainerUniversalMachO::Terminate();
-
 #if defined(_MSC_VER)
   ProcessWindowsLog::Terminate();
 #endif
 
   Socket::Terminate();
   HostInfo::Terminate();
   Log::DisableAllLogChannels();
   FileSystem::Terminate();
   Reproducer::Terminate();
 }