diff options
| author | Greg Clayton <gclayton@apple.com> | 2015-07-27 23:21:05 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2015-07-27 23:21:05 +0000 |
| commit | a381e10518c6457104d343655f128a6d625789a3 (patch) | |
| tree | 4a9accd5ce4b5c5a819c5d4ff91eb9ce287b58a3 /lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp | |
| parent | 4746c2fcdb2e19dc62811c6e2e5782697b5f7c4d (diff) | |
| download | bcm5719-llvm-a381e10518c6457104d343655f128a6d625789a3.tar.gz bcm5719-llvm-a381e10518c6457104d343655f128a6d625789a3.zip | |
Make sure we detect symbols in the new __DATA_DIRTY and __DATA_CONST segments and classify them correctly.
<rdar://problem/20942073>
llvm-svn: 243344
Diffstat (limited to 'lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp')
| -rw-r--r-- | lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 9841acb51c3..660c31e6683 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -1028,6 +1028,20 @@ ObjectFileMachO::GetSegmentNameDATA() } const ConstString & +ObjectFileMachO::GetSegmentNameDATA_DIRTY() +{ + static ConstString g_segment_name ("__DATA_DIRTY"); + return g_segment_name; +} + +const ConstString & +ObjectFileMachO::GetSegmentNameDATA_CONST() +{ + static ConstString g_segment_name ("__DATA_CONST"); + return g_segment_name; +} + +const ConstString & ObjectFileMachO::GetSegmentNameOBJC() { static ConstString g_segment_name_OBJC ("__OBJC"); @@ -2442,10 +2456,14 @@ ObjectFileMachO::ParseSymtab () const ConstString &g_segment_name_TEXT = GetSegmentNameTEXT(); const ConstString &g_segment_name_DATA = GetSegmentNameDATA(); + const ConstString &g_segment_name_DATA_DIRTY = GetSegmentNameDATA_DIRTY(); + const ConstString &g_segment_name_DATA_CONST = GetSegmentNameDATA_CONST(); const ConstString &g_segment_name_OBJC = GetSegmentNameOBJC(); const ConstString &g_section_name_eh_frame = GetSectionNameEHFrame(); SectionSP text_section_sp(section_list->FindSectionByName(g_segment_name_TEXT)); SectionSP data_section_sp(section_list->FindSectionByName(g_segment_name_DATA)); + SectionSP data_dirty_section_sp(section_list->FindSectionByName(g_segment_name_DATA_DIRTY)); + SectionSP data_const_section_sp(section_list->FindSectionByName(g_segment_name_DATA_CONST)); SectionSP objc_section_sp(section_list->FindSectionByName(g_segment_name_OBJC)); SectionSP eh_frame_section_sp; if (text_section_sp.get()) @@ -3298,7 +3316,9 @@ ObjectFileMachO::ParseSymtab () else type = eSymbolTypeCode; } - else if (symbol_section->IsDescendant(data_section_sp.get())) + else if (symbol_section->IsDescendant(data_section_sp.get()) || + symbol_section->IsDescendant(data_dirty_section_sp.get()) || + symbol_section->IsDescendant(data_const_section_sp.get())) { if (symbol_sect_name && ::strstr (symbol_sect_name, "__objc") == symbol_sect_name) { @@ -4148,7 +4168,9 @@ ObjectFileMachO::ParseSymtab () type = eSymbolTypeCode; } else - if (symbol_section->IsDescendant(data_section_sp.get())) + if (symbol_section->IsDescendant(data_section_sp.get()) || + symbol_section->IsDescendant(data_dirty_section_sp.get()) || + symbol_section->IsDescendant(data_const_section_sp.get())) { if (symbol_sect_name && ::strstr (symbol_sect_name, "__objc") == symbol_sect_name) { |
