Author: Jason Molenda Date: 2022-02-14T11:12:58-08:00 New Revision: 4a394367c124172dff26ef5042ecd6fa666a6e07
URL: https://github.com/llvm/llvm-project/commit/4a394367c124172dff26ef5042ecd6fa666a6e07 DIFF: https://github.com/llvm/llvm-project/commit/4a394367c124172dff26ef5042ecd6fa666a6e07.diff LOG: Alt mechanism to find the first loadable seg in a Mach-O binary ObjectFileMachO, for a couple of special binaries at the initial launch, needs to find segment load addresses before the Target's SectionLoadList has been initialized. The calculation to find the first segment, which is at the same address as the mach header, was not correct if the binary was in the Darwin shared cache. Update the logic to handle that case. Differential Revision: https://reviews.llvm.org/D119602 rdar://88802629 Added: Modified: lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 131d1932fe142..ff4d0a1cc41cf 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -6102,6 +6102,15 @@ Section *ObjectFileMachO::GetMachHeaderSection() { if (section->GetFileOffset() == 0 && SectionIsLoadable(section)) return section; } + + // We may have a binary in the shared cache that has a non-zero + // file address for its first segment, traditionally the __TEXT segment. + // Search for it by name and return it as our next best guess. + SectionSP text_segment_sp = + GetSectionList()->FindSectionByName(GetSegmentNameTEXT()); + if (text_segment_sp.get() && SectionIsLoadable(text_segment_sp.get())) + return text_segment_sp.get(); + return nullptr; } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
