Skip to content

Commit

Permalink
[Object, MachO] Mark symbols from DATA and BSS sections as ST_Data
Browse files Browse the repository at this point in the history
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

llvm-svn: 252867
kubamracek committed Nov 12, 2015
1 parent e59cc3e commit de83322
Showing 3 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions llvm/lib/Object/MachOObjectFile.cpp
Original file line number Diff line number Diff line change
@@ -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;
6 changes: 3 additions & 3 deletions llvm/test/tools/llvm-objdump/X86/macho-symbol-table.test
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion llvm/tools/llvm-objdump/MachODump.cpp
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit de83322

Please sign in to comment.