Index: lldb/source/API/SystemInitializerFull.cpp =================================================================== --- lldb/source/API/SystemInitializerFull.cpp +++ lldb/source/API/SystemInitializerFull.cpp @@ -168,11 +168,11 @@ if (auto e = SystemInitializerCommon::Initialize()) return e; - breakpad::ObjectFileBreakpad::Initialize(); + ObjectFileBreakpad::Initialize(); ObjectFileELF::Initialize(); ObjectFileMachO::Initialize(); ObjectFilePECOFF::Initialize(); - wasm::ObjectFileWasm::Initialize(); + ObjectFileWasm::Initialize(); ObjectContainerBSDArchive::Initialize(); ObjectContainerUniversalMachO::Initialize(); @@ -191,12 +191,12 @@ ScriptInterpreterLua::Initialize(); #endif - platform_freebsd::PlatformFreeBSD::Initialize(); - platform_linux::PlatformLinux::Initialize(); - platform_netbsd::PlatformNetBSD::Initialize(); - platform_openbsd::PlatformOpenBSD::Initialize(); + PlatformFreeBSD::Initialize(); + PlatformLinux::Initialize(); + PlatformNetBSD::Initialize(); + PlatformOpenBSD::Initialize(); PlatformWindows::Initialize(); - platform_android::PlatformAndroid::Initialize(); + PlatformAndroid::Initialize(); PlatformRemoteiOS::Initialize(); PlatformMacOSX::Initialize(); @@ -220,7 +220,7 @@ JITLoaderGDB::Initialize(); ProcessElfCore::Initialize(); ProcessMachCore::Initialize(); - minidump::ProcessMinidump::Initialize(); + ProcessMinidump::Initialize(); MemoryHistoryASan::Initialize(); AddressSanitizerRuntime::Initialize(); ThreadSanitizerRuntime::Initialize(); @@ -228,11 +228,11 @@ MainThreadCheckerRuntime::Initialize(); SymbolVendorELF::Initialize(); - breakpad::SymbolFileBreakpad::Initialize(); + SymbolFileBreakpad::Initialize(); SymbolFileDWARF::Initialize(); SymbolFilePDB::Initialize(); SymbolFileSymtab::Initialize(); - wasm::SymbolVendorWasm::Initialize(); + SymbolVendorWasm::Initialize(); UnwindAssemblyInstEmulation::Initialize(); UnwindAssembly_x86::Initialize(); @@ -270,9 +270,9 @@ StructuredDataDarwinLog::Initialize(); // Platform agnostic plugins - platform_gdb_server::PlatformRemoteGDBServer::Initialize(); + PlatformRemoteGDBServer::Initialize(); - process_gdb_remote::ProcessGDBRemote::Initialize(); + ProcessGDBRemote::Initialize(); DynamicLoaderMacOSXDYLD::Initialize(); DynamicLoaderMacOS::Initialize(); DynamicLoaderPOSIXDYLD::Initialize(); @@ -314,15 +314,15 @@ JITLoaderGDB::Terminate(); ProcessElfCore::Terminate(); ProcessMachCore::Terminate(); - minidump::ProcessMinidump::Terminate(); + ProcessMinidump::Terminate(); MemoryHistoryASan::Terminate(); AddressSanitizerRuntime::Terminate(); ThreadSanitizerRuntime::Terminate(); UndefinedBehaviorSanitizerRuntime::Terminate(); MainThreadCheckerRuntime::Terminate(); - wasm::SymbolVendorWasm::Terminate(); + SymbolVendorWasm::Terminate(); SymbolVendorELF::Terminate(); - breakpad::SymbolFileBreakpad::Terminate(); + SymbolFileBreakpad::Terminate(); SymbolFileDWARF::Terminate(); SymbolFilePDB::Terminate(); SymbolFileSymtab::Terminate(); @@ -357,8 +357,8 @@ #endif Debugger::SettingsTerminate(); - platform_gdb_server::PlatformRemoteGDBServer::Terminate(); - process_gdb_remote::ProcessGDBRemote::Terminate(); + PlatformRemoteGDBServer::Terminate(); + ProcessGDBRemote::Terminate(); StructuredDataDarwinLog::Terminate(); DynamicLoaderMacOSXDYLD::Terminate(); @@ -367,20 +367,20 @@ DynamicLoaderStatic::Terminate(); DynamicLoaderWindowsDYLD::Terminate(); - platform_freebsd::PlatformFreeBSD::Terminate(); - platform_linux::PlatformLinux::Terminate(); - platform_netbsd::PlatformNetBSD::Terminate(); - platform_openbsd::PlatformOpenBSD::Terminate(); + PlatformFreeBSD::Terminate(); + PlatformLinux::Terminate(); + PlatformNetBSD::Terminate(); + PlatformOpenBSD::Terminate(); PlatformWindows::Terminate(); - platform_android::PlatformAndroid::Terminate(); + PlatformAndroid::Terminate(); PlatformMacOSX::Terminate(); PlatformRemoteiOS::Terminate(); - breakpad::ObjectFileBreakpad::Terminate(); + ObjectFileBreakpad::Terminate(); ObjectFileELF::Terminate(); ObjectFileMachO::Terminate(); ObjectFilePECOFF::Terminate(); - wasm::ObjectFileWasm::Terminate(); + ObjectFileWasm::Terminate(); ObjectContainerBSDArchive::Terminate(); ObjectContainerUniversalMachO::Terminate(); Index: lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h =================================================================== --- lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h +++ lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h @@ -13,7 +13,6 @@ #include "lldb/Utility/ArchSpec.h" namespace lldb_private { -namespace breakpad { class ObjectFileBreakpad : public ObjectFile { public: @@ -101,6 +100,5 @@ lldb::offset_t length, ArchSpec arch, UUID uuid); }; -} // namespace breakpad } // namespace lldb_private #endif // LLDB_PLUGINS_OBJECTFILE_BREAKPAD_OBJECTFILEBREAKPAD_H Index: lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.h =================================================================== --- lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.h +++ lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.h @@ -13,7 +13,6 @@ #include "lldb/Utility/ArchSpec.h" namespace lldb_private { -namespace wasm { /// Generic Wasm object file reader. /// @@ -148,6 +147,5 @@ uint32_t m_code_section_offset; }; -} // namespace wasm } // namespace lldb_private #endif // LLDB_PLUGINS_OBJECTFILE_WASM_OBJECTFILEWASM_H Index: lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp =================================================================== --- lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp +++ lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp @@ -26,7 +26,6 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::wasm; static const uint32_t kWasmHeaderSize = sizeof(llvm::wasm::WasmMagic) + sizeof(llvm::wasm::WasmVersion); Index: lldb/source/Plugins/Platform/Android/PlatformAndroid.h =================================================================== --- lldb/source/Plugins/Platform/Android/PlatformAndroid.h +++ lldb/source/Plugins/Platform/Android/PlatformAndroid.h @@ -17,9 +17,8 @@ #include "AdbClient.h" namespace lldb_private { -namespace platform_android { -class PlatformAndroid : public platform_linux::PlatformLinux { +class PlatformAndroid : public PlatformLinux { public: PlatformAndroid(bool is_host); @@ -71,16 +70,15 @@ GetLibdlFunctionDeclarations(lldb_private::Process *process) override; private: - AdbClient::SyncService *GetSyncService(Status &error); + platform_android::AdbClient::SyncService *GetSyncService(Status &error); - std::unique_ptr m_adb_sync_svc; + std::unique_ptr m_adb_sync_svc; std::string m_device_id; uint32_t m_sdk_version; DISALLOW_COPY_AND_ASSIGN(PlatformAndroid); }; -} // namespace platofor_android } // namespace lldb_private #endif // liblldb_PlatformAndroid_h_ Index: lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h =================================================================== --- lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h +++ lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h @@ -21,8 +21,7 @@ namespace lldb_private { namespace platform_android { -class PlatformAndroidRemoteGDBServer - : public platform_gdb_server::PlatformRemoteGDBServer { +class PlatformAndroidRemoteGDBServer : public PlatformRemoteGDBServer { public: PlatformAndroidRemoteGDBServer(); Index: lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h =================================================================== --- lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h +++ lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h @@ -12,7 +12,6 @@ #include "Plugins/Platform/POSIX/PlatformPOSIX.h" namespace lldb_private { -namespace platform_freebsd { class PlatformFreeBSD : public PlatformPOSIX { public: @@ -65,7 +64,6 @@ DISALLOW_COPY_AND_ASSIGN(PlatformFreeBSD); }; -} // namespace platform_freebsd } // namespace lldb_private #endif // liblldb_PlatformFreeBSD_h_ Index: lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp =================================================================== --- lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp +++ lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp @@ -34,7 +34,6 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::platform_freebsd; static uint32_t g_initialize_count = 0; Index: lldb/source/Plugins/Platform/Linux/PlatformLinux.h =================================================================== --- lldb/source/Plugins/Platform/Linux/PlatformLinux.h +++ lldb/source/Plugins/Platform/Linux/PlatformLinux.h @@ -12,7 +12,6 @@ #include "Plugins/Platform/POSIX/PlatformPOSIX.h" namespace lldb_private { -namespace platform_linux { class PlatformLinux : public PlatformPOSIX { public: @@ -63,7 +62,6 @@ DISALLOW_COPY_AND_ASSIGN(PlatformLinux); }; -} // namespace platform_linux } // namespace lldb_private #endif // liblldb_PlatformLinux_h_ Index: lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp =================================================================== --- lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp +++ lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp @@ -32,7 +32,6 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::platform_linux; static uint32_t g_initialize_count = 0; Index: lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.h =================================================================== --- lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.h +++ lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.h @@ -12,7 +12,6 @@ #include "Plugins/Platform/POSIX/PlatformPOSIX.h" namespace lldb_private { -namespace platform_netbsd { class PlatformNetBSD : public PlatformPOSIX { public: @@ -63,7 +62,6 @@ DISALLOW_COPY_AND_ASSIGN(PlatformNetBSD); }; -} // namespace platform_netbsd } // namespace lldb_private #endif // liblldb_PlatformNetBSD_h_ Index: lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp =================================================================== --- lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp +++ lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp @@ -32,7 +32,6 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::platform_netbsd; static uint32_t g_initialize_count = 0; Index: lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.h =================================================================== --- lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.h +++ lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.h @@ -12,7 +12,6 @@ #include "Plugins/Platform/POSIX/PlatformPOSIX.h" namespace lldb_private { -namespace platform_openbsd { class PlatformOpenBSD : public PlatformPOSIX { public: @@ -57,7 +56,6 @@ DISALLOW_COPY_AND_ASSIGN(PlatformOpenBSD); }; -} // namespace platform_openbsd } // namespace lldb_private #endif // liblldb_PlatformOpenBSD_h_ Index: lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp =================================================================== --- lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp +++ lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp @@ -32,7 +32,6 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::platform_openbsd; static uint32_t g_initialize_count = 0; Index: lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h =================================================================== --- lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h +++ lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h @@ -17,7 +17,6 @@ #include "lldb/Target/Platform.h" namespace lldb_private { -namespace platform_gdb_server { class PlatformRemoteGDBServer : public Platform, private UserIDResolver { public: @@ -195,7 +194,6 @@ DISALLOW_COPY_AND_ASSIGN(PlatformRemoteGDBServer); }; -} // namespace platform_gdb_server } // namespace lldb_private #endif // liblldb_PlatformRemoteGDBServer_h_ Index: lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp =================================================================== --- lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp +++ lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp @@ -33,7 +33,6 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::platform_gdb_server; static bool g_initialized = false; Index: lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h =================================================================== --- lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h +++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h @@ -30,6 +30,7 @@ namespace repro { class PacketRecorder; } +class ProcessGDBRemote; namespace process_gdb_remote { enum GDBStoppointType { @@ -51,7 +52,6 @@ LZMA, // Lempel–Ziv–Markov chain algorithm }; -class ProcessGDBRemote; class GDBRemoteCommunication : public Communication { public: Index: lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h =================================================================== --- lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h +++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h @@ -28,9 +28,8 @@ class StringExtractorGDBRemote; namespace lldb_private { -namespace process_gdb_remote { - class ProcessGDBRemote; +namespace process_gdb_remote { /// Dummy GDB server that replays packets from the GDB Remote Communication /// history. This is used to replay GDB packets. Index: lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h =================================================================== --- lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h +++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h @@ -23,10 +23,10 @@ class StringExtractor; namespace lldb_private { +class ProcessGDBRemote; namespace process_gdb_remote { class ThreadGDBRemote; -class ProcessGDBRemote; class GDBRemoteDynamicRegisterInfo : public DynamicRegisterInfo { public: Index: lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h =================================================================== --- lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h +++ lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h @@ -42,12 +42,14 @@ namespace repro { class Loader; } -namespace process_gdb_remote { +namespace process_gdb_remote { class ThreadGDBRemote; +} -class ProcessGDBRemote : public Process, - private GDBRemoteClientBase::ContinueDelegate { +class ProcessGDBRemote + : public Process, + private process_gdb_remote::GDBRemoteClientBase::ContinueDelegate { public: ProcessGDBRemote(lldb::TargetSP target_sp, lldb::ListenerSP listener_sp); @@ -183,7 +185,9 @@ bool StopNoticingNewThreads() override; - GDBRemoteCommunicationClient &GetGDBRemote() { return m_gdb_comm; } + process_gdb_remote::GDBRemoteCommunicationClient &GetGDBRemote() { + return m_gdb_comm; + } Status SendEventData(const char *data) override; @@ -232,9 +236,9 @@ StringExtractorGDBRemote &inputStringExtractor); protected: - friend class ThreadGDBRemote; - friend class GDBRemoteCommunicationClient; - friend class GDBRemoteRegisterContext; + friend class process_gdb_remote::ThreadGDBRemote; + friend class process_gdb_remote::GDBRemoteCommunicationClient; + friend class process_gdb_remote::GDBRemoteRegisterContext; /// Broadcaster event bits definitions. enum { @@ -243,15 +247,15 @@ eBroadcastBitAsyncThreadDidExit = (1 << 2) }; - GDBRemoteCommunicationClient m_gdb_comm; - GDBRemoteCommunicationReplayServer m_gdb_replay_server; + process_gdb_remote::GDBRemoteCommunicationClient m_gdb_comm; + process_gdb_remote::GDBRemoteCommunicationReplayServer m_gdb_replay_server; std::atomic m_debugserver_pid; std::vector m_stop_packet_stack; // The stop packet // stack replaces // the last stop // packet variable std::recursive_mutex m_last_stop_packet_mutex; - GDBRemoteDynamicRegisterInfo m_register_info; + process_gdb_remote::GDBRemoteDynamicRegisterInfo m_register_info; Broadcaster m_async_broadcaster; lldb::ListenerSP m_async_listener_sp; HostThread m_async_thread; @@ -332,7 +336,7 @@ void GetMaxMemorySize(); - bool CalculateThreadStopInfo(ThreadGDBRemote *thread); + bool CalculateThreadStopInfo(process_gdb_remote::ThreadGDBRemote *thread); size_t UpdateThreadPCsFromStopReplyThreadsValue(std::string &value); @@ -354,7 +358,7 @@ lldb::StateType SetThreadStopInfo(StringExtractor &stop_packet); bool - GetThreadStopInfoFromJSON(ThreadGDBRemote *thread, + GetThreadStopInfoFromJSON(process_gdb_remote::ThreadGDBRemote *thread, const StructuredData::ObjectSP &thread_infos_sp); lldb::ThreadSP SetThreadStopInfo(StructuredData::Dictionary *thread_dict); @@ -386,7 +390,7 @@ DynamicLoader *GetDynamicLoader() override; bool GetGDBServerRegisterInfoXMLAndProcess(ArchSpec &arch_to_use, - std::string xml_filename, + std::string xml_filename, uint32_t &cur_reg_num, uint32_t ®_offset); @@ -452,7 +456,6 @@ DISALLOW_COPY_AND_ASSIGN(ProcessGDBRemote); }; -} // namespace process_gdb_remote } // namespace lldb_private #endif // liblldb_ProcessGDBRemote_h_ Index: lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp =================================================================== --- lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -4797,7 +4797,7 @@ } llvm::Error ProcessGDBRemote::LoadModules() { - using lldb_private::process_gdb_remote::ProcessGDBRemote; + using lldb_private::ProcessGDBRemote; // request a list of loaded libraries from GDBServer llvm::Expected module_list = GetLoadedModuleList(); Index: lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h =================================================================== --- lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h +++ lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h @@ -18,10 +18,8 @@ namespace lldb_private { class Process; - -namespace process_gdb_remote { - class ProcessGDBRemote; +namespace process_gdb_remote { class ThreadGDBRemote : public Thread { public: @@ -89,7 +87,7 @@ StructuredData::ObjectSP FetchThreadExtendedInfo() override; protected: - friend class ProcessGDBRemote; + friend class lldb_private::ProcessGDBRemote; std::string m_thread_name; std::string m_dispatch_queue_name; Index: lldb/source/Plugins/Process/minidump/ProcessMinidump.h =================================================================== --- lldb/source/Plugins/Process/minidump/ProcessMinidump.h +++ lldb/source/Plugins/Process/minidump/ProcessMinidump.h @@ -24,8 +24,6 @@ namespace lldb_private { -namespace minidump { - class ProcessMinidump : public Process { public: static lldb::ProcessSP CreateInstance(lldb::TargetSP target_sp, @@ -92,7 +90,7 @@ return error; } - llvm::Optional m_minidump_parser; + llvm::Optional m_minidump_parser; protected: void Clear(); @@ -116,7 +114,6 @@ void BuildMemoryRegions(); }; -} // namespace minidump } // namespace lldb_private #endif // liblldb_ProcessMinidump_h_ Index: lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h =================================================================== --- lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h +++ lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.h @@ -18,8 +18,6 @@ namespace lldb_private { -namespace breakpad { - class SymbolFileBreakpad : public SymbolFile { /// LLVM RTTI support. static char ID; @@ -173,7 +171,7 @@ // Return an iterator range for all records in the given object file of the // given type. - llvm::iterator_range lines(Record::Kind section_type); + llvm::iterator_range lines(breakpad::Record::Kind section_type); // Breakpad files do not contain sufficient information to correctly // reconstruct compile units. The approach chosen here is to treat each @@ -236,7 +234,6 @@ llvm::BumpPtrAllocator m_allocator; }; -} // namespace breakpad } // namespace lldb_private #endif Index: lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.h =================================================================== --- lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.h +++ lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.h @@ -13,7 +13,6 @@ #include "lldb/lldb-private.h" namespace lldb_private { -namespace wasm { class SymbolVendorWasm : public lldb_private::SymbolVendor { public: @@ -38,7 +37,6 @@ DISALLOW_COPY_AND_ASSIGN(SymbolVendorWasm); }; -} // namespace wasm } // namespace lldb_private #endif // liblldb_SymbolVendorWasm_h_ Index: lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp =================================================================== --- lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp +++ lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp @@ -24,7 +24,6 @@ using namespace lldb; using namespace lldb_private; -using namespace lldb_private::wasm; // SymbolVendorWasm constructor SymbolVendorWasm::SymbolVendorWasm(const lldb::ModuleSP &module_sp) Index: lldb/tools/lldb-test/SystemInitializerTest.cpp =================================================================== --- lldb/tools/lldb-test/SystemInitializerTest.cpp +++ lldb/tools/lldb-test/SystemInitializerTest.cpp @@ -151,23 +151,23 @@ if (auto e = SystemInitializerCommon::Initialize()) return e; - breakpad::ObjectFileBreakpad::Initialize(); + ObjectFileBreakpad::Initialize(); ObjectFileELF::Initialize(); ObjectFileMachO::Initialize(); ObjectFilePECOFF::Initialize(); - wasm::ObjectFileWasm::Initialize(); + ObjectFileWasm::Initialize(); ObjectContainerBSDArchive::Initialize(); ObjectContainerUniversalMachO::Initialize(); ScriptInterpreterNone::Initialize(); - platform_freebsd::PlatformFreeBSD::Initialize(); - platform_linux::PlatformLinux::Initialize(); - platform_netbsd::PlatformNetBSD::Initialize(); - platform_openbsd::PlatformOpenBSD::Initialize(); + PlatformFreeBSD::Initialize(); + PlatformLinux::Initialize(); + PlatformNetBSD::Initialize(); + PlatformOpenBSD::Initialize(); PlatformWindows::Initialize(); - platform_android::PlatformAndroid::Initialize(); + PlatformAndroid::Initialize(); PlatformRemoteiOS::Initialize(); PlatformMacOSX::Initialize(); @@ -191,7 +191,7 @@ JITLoaderGDB::Initialize(); ProcessElfCore::Initialize(); ProcessMachCore::Initialize(); - minidump::ProcessMinidump::Initialize(); + ProcessMinidump::Initialize(); MemoryHistoryASan::Initialize(); AddressSanitizerRuntime::Initialize(); ThreadSanitizerRuntime::Initialize(); @@ -199,11 +199,11 @@ MainThreadCheckerRuntime::Initialize(); SymbolVendorELF::Initialize(); - breakpad::SymbolFileBreakpad::Initialize(); + SymbolFileBreakpad::Initialize(); SymbolFileDWARF::Initialize(); SymbolFilePDB::Initialize(); SymbolFileSymtab::Initialize(); - wasm::SymbolVendorWasm::Initialize(); + SymbolVendorWasm::Initialize(); UnwindAssemblyInstEmulation::Initialize(); UnwindAssembly_x86::Initialize(); @@ -240,9 +240,9 @@ StructuredDataDarwinLog::Initialize(); // Platform agnostic plugins - platform_gdb_server::PlatformRemoteGDBServer::Initialize(); + PlatformRemoteGDBServer::Initialize(); - process_gdb_remote::ProcessGDBRemote::Initialize(); + ProcessGDBRemote::Initialize(); DynamicLoaderMacOSXDYLD::Initialize(); DynamicLoaderMacOS::Initialize(); DynamicLoaderPOSIXDYLD::Initialize(); @@ -284,15 +284,15 @@ JITLoaderGDB::Terminate(); ProcessElfCore::Terminate(); ProcessMachCore::Terminate(); - minidump::ProcessMinidump::Terminate(); + ProcessMinidump::Terminate(); MemoryHistoryASan::Terminate(); AddressSanitizerRuntime::Terminate(); ThreadSanitizerRuntime::Terminate(); UndefinedBehaviorSanitizerRuntime::Terminate(); MainThreadCheckerRuntime::Terminate(); - wasm::SymbolVendorWasm::Terminate(); + SymbolVendorWasm::Terminate(); SymbolVendorELF::Terminate(); - breakpad::SymbolFileBreakpad::Terminate(); + SymbolFileBreakpad::Terminate(); SymbolFileDWARF::Terminate(); SymbolFilePDB::Terminate(); SymbolFileSymtab::Terminate(); @@ -327,8 +327,8 @@ #endif Debugger::SettingsTerminate(); - platform_gdb_server::PlatformRemoteGDBServer::Terminate(); - process_gdb_remote::ProcessGDBRemote::Terminate(); + PlatformRemoteGDBServer::Terminate(); + ProcessGDBRemote::Terminate(); StructuredDataDarwinLog::Terminate(); DynamicLoaderMacOSXDYLD::Terminate(); @@ -337,20 +337,20 @@ DynamicLoaderStatic::Terminate(); DynamicLoaderWindowsDYLD::Terminate(); - platform_freebsd::PlatformFreeBSD::Terminate(); - platform_linux::PlatformLinux::Terminate(); - platform_netbsd::PlatformNetBSD::Terminate(); - platform_openbsd::PlatformOpenBSD::Terminate(); + PlatformFreeBSD::Terminate(); + PlatformLinux::Terminate(); + PlatformNetBSD::Terminate(); + PlatformOpenBSD::Terminate(); PlatformWindows::Terminate(); - platform_android::PlatformAndroid::Terminate(); + PlatformAndroid::Terminate(); PlatformMacOSX::Terminate(); PlatformRemoteiOS::Terminate(); - breakpad::ObjectFileBreakpad::Terminate(); + ObjectFileBreakpad::Terminate(); ObjectFileELF::Terminate(); ObjectFileMachO::Terminate(); ObjectFilePECOFF::Terminate(); - wasm::ObjectFileWasm::Terminate(); + ObjectFileWasm::Terminate(); ObjectContainerBSDArchive::Terminate(); ObjectContainerUniversalMachO::Terminate();