[PATCH] D14576: [Object, MachO] Mark symbols from DATA and BSS sections as ST_Data

[Kuba Brecka via llvm-commits]

kubabrecka created this revision.
kubabrecka added reviewers: rafael, friss, aprantl, samsonov.
kubabrecka added subscribers: llvm-commits, zaks.anna, ismailp.

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`.

http://reviews.llvm.org/D14576

Files:
  lib/Object/MachOObjectFile.cpp
  test/tools/llvm-objdump/X86/macho-symbol-table.test
  tools/llvm-objdump/MachODump.cpp

Index: tools/llvm-objdump/MachODump.cpp
===================================================================
--- tools/llvm-objdump/MachODump.cpp
+++ tools/llvm-objdump/MachODump.cpp
@@ -6173,7 +6173,7 @@
       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.
Index: test/tools/llvm-objdump/X86/macho-symbol-table.test
===================================================================
--- test/tools/llvm-objdump/X86/macho-symbol-table.test
+++ 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
Index: lib/Object/MachOObjectFile.cpp
===================================================================
--- lib/Object/MachOObjectFile.cpp
+++ lib/Object/MachOObjectFile.cpp
@@ -401,6 +401,10 @@
     case MachO::N_UNDF :
       return SymbolRef::ST_Unknown;
     case MachO::N_SECT :
+      StringRef SymbolName = *getSymbolName(Symb);
+      section_iterator Sec = *getSymbolSection(Symb);
+      if (Sec->isData() || Sec->isBSS())
+        return SymbolRef::ST_Data;
       return SymbolRef::ST_Function;
   }
   return SymbolRef::ST_Other;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D14576.39938.patch
Type: text/x-patch
Size: 1874 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151111/cc2e4b49/attachment.bin>