From 4e0567ae265441bcc78ca629110f638a1428ee2a Mon Sep 17 00:00:00 2001 From: Kuba Brecka Date: Thu, 12 Nov 2015 09:40:29 +0000 Subject: [PATCH] [Object, MachO] Mark symbols from DATA and BSS sections as ST_Data In `MachOObjectFile::getSymbolType` we currently always return `SymbolRef::ST_Function` for symbols from any section. In order for llvm-symbolizer to correctly symbolize Mach-O globals, symbols from data and BSS sections should return `SymbolRef::ST_Data`. Differential Revision: http://reviews.llvm.org/D14576 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@252867 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/MachOObjectFile.cpp | 3 +++ test/tools/llvm-objdump/X86/macho-symbol-table.test | 6 +++--- tools/llvm-objdump/MachODump.cpp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp index 4f9ccedd0c6..e34c86542ab 100644 --- a/lib/Object/MachOObjectFile.cpp +++ b/lib/Object/MachOObjectFile.cpp @@ -401,6 +401,9 @@ SymbolRef::Type MachOObjectFile::getSymbolType(DataRefImpl Symb) const { case MachO::N_UNDF : return SymbolRef::ST_Unknown; case MachO::N_SECT : + section_iterator Sec = *getSymbolSection(Symb); + if (Sec->isData() || Sec->isBSS()) + return SymbolRef::ST_Data; return SymbolRef::ST_Function; } return SymbolRef::ST_Other; diff --git a/test/tools/llvm-objdump/X86/macho-symbol-table.test b/test/tools/llvm-objdump/X86/macho-symbol-table.test index 826d78af68b..19c619e73d0 100644 --- a/test/tools/llvm-objdump/X86/macho-symbol-table.test +++ b/test/tools/llvm-objdump/X86/macho-symbol-table.test @@ -1,8 +1,8 @@ RUN: llvm-objdump -macho -t %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s CHECK: SYMBOL TABLE: -CHECK: 000000000000003b l F __TEXT,__cstring L_.str -CHECK: 0000000000000068 l F __TEXT,__eh_frame EH_frame0 +CHECK: 000000000000003b l __TEXT,__cstring L_.str +CHECK: 0000000000000068 l __TEXT,__eh_frame EH_frame0 CHECK: 0000000000000000 g F __TEXT,__text _main -CHECK: 0000000000000080 g F __TEXT,__eh_frame _main.eh +CHECK: 0000000000000080 g __TEXT,__eh_frame _main.eh CHECK: 0000000000000000 *UND* _printf diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp index a5895ee3caa..3fea0b2a4ee 100644 --- a/tools/llvm-objdump/MachODump.cpp +++ b/tools/llvm-objdump/MachODump.cpp @@ -6173,7 +6173,7 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF, StringRef SymName = *SymNameOrErr; SymbolRef::Type ST = Symbols[SymIdx].getType(); - if (ST != SymbolRef::ST_Function) + if (ST != SymbolRef::ST_Function && ST != SymbolRef::ST_Data) continue; // Make sure the symbol is defined in this section. -- 2.34.1