This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rG48321eea9679: Check m_dyld_up directly in LoadBinariesViaMetadata (authored by jasonmolenda).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D137807/new/ https://reviews.llvm.org/D137807 Files: lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp Index: lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp =================================================================== --- lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp +++ lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp @@ -327,9 +327,11 @@ // corefile core_objfile->LoadCoreFileImages(*this); - // LoadCoreFileImges may have set the dynamic loader; if we now have - // a dynamic loader, save its name so we don't un-set it later. - if (GetDynamicLoader()) + // LoadCoreFileImges may have set the dynamic loader, e.g. in + // PlatformDarwinKernel::LoadPlatformBinaryAndSetup(). + // If we now have a dynamic loader, save its name so we don't + // un-set it later. + if (m_dyld_up) m_dyld_plugin_name = GetDynamicLoader()->GetPluginName(); }
Index: lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp =================================================================== --- lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp +++ lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp @@ -327,9 +327,11 @@ // corefile core_objfile->LoadCoreFileImages(*this); - // LoadCoreFileImges may have set the dynamic loader; if we now have - // a dynamic loader, save its name so we don't un-set it later. - if (GetDynamicLoader()) + // LoadCoreFileImges may have set the dynamic loader, e.g. in + // PlatformDarwinKernel::LoadPlatformBinaryAndSetup(). + // If we now have a dynamic loader, save its name so we don't + // un-set it later. + if (m_dyld_up) m_dyld_plugin_name = GetDynamicLoader()->GetPluginName(); }
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits