Skip to content

Commit ff8a65e

Browse files
authored
Merge pull request #5597 from jasonmolenda/r102210820-dont-force-dyld-setting-during-corefile-scan-1013
Check m_dyld_up directly in LoadBinariesViaMetadata
2 parents aa89109 + a8b50db commit ff8a65e

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,11 @@ void ProcessMachCore::LoadBinariesViaMetadata() {
327327
// corefile
328328
core_objfile->LoadCoreFileImages(*this);
329329

330-
// LoadCoreFileImges may have set the dynamic loader; if we now have
331-
// a dynamic loader, save its name so we don't un-set it later.
332-
if (GetDynamicLoader())
330+
// LoadCoreFileImges may have set the dynamic loader, e.g. in
331+
// PlatformDarwinKernel::LoadPlatformBinaryAndSetup().
332+
// If we now have a dynamic loader, save its name so we don't
333+
// un-set it later.
334+
if (m_dyld_up)
333335
m_dyld_plugin_name = GetDynamicLoader()->GetPluginName();
334336
}
335337

0 commit comments

Comments
 (0)