[dsymutil] Gather global and local symbol addresses in the main executable.

Usually local symbols will have their address described in the debug
map. Global symbols have to have their address looked up in the symbol
table of the main executable. By playing with 'ld -r' and export lists,
you can get a symbol described as global by the debug map while actually
being a local symbol as far as the link in concerned. By gathering the
address of local symbols, we fix this issue.

Also, we prefer a global symbol in case of a name collision to preserve
the previous behavior.

Note that using the 'ld -r' tricks, people can actually cause symbol
names collisions that dsymutil has no way to figure out. This fixes the
simple case where there is only one symbol of a given name.

rdar://problem/32826621

Differential revision: https://reviews.llvm.org/D54922

llvm-svn: 348021

diff --git a/llvm/test/tools/dsymutil/Inputs/global_downgraded_to_static.x86_64 b/llvm/test/tools/dsymutil/Inputs/global_downgraded_to_static.x86_64
new file mode 100755 (executable)
index 0000000..fa7a1d1
Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/global_downgraded_to_static.x86_64 differ

diff --git a/llvm/test/tools/dsymutil/Inputs/global_downgraded_to_static/1.o b/llvm/test/tools/dsymutil/Inputs/global_downgraded_to_static/1.o
new file mode 100644 (file)
index 0000000..cd00c76
Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/global_downgraded_to_static/1.o differ

diff --git a/llvm/test/tools/dsymutil/Inputs/global_downgraded_to_static/1.r.o b/llvm/test/tools/dsymutil/Inputs/global_downgraded_to_static/1.r.o
new file mode 100644 (file)
index 0000000..6629b4c
Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/global_downgraded_to_static/1.r.o differ

diff --git a/llvm/test/tools/dsymutil/Inputs/global_downgraded_to_static/2.o b/llvm/test/tools/dsymutil/Inputs/global_downgraded_to_static/2.o
new file mode 100644 (file)
index 0000000..2bb8944
Binary files /dev/null and b/llvm/test/tools/dsymutil/Inputs/global_downgraded_to_static/2.o differ

diff --git a/llvm/test/tools/dsymutil/X86/global_downgraded_to_static.c b/llvm/test/tools/dsymutil/X86/global_downgraded_to_static.c
new file mode 100644 (file)
index 0000000..35c3247
--- /dev/null
+++ b/llvm/test/tools/dsymutil/X86/global_downgraded_to_static.c
@@ -0,0 +1,24 @@
+// REQUIRES : system-darwin
+// RUN: dsymutil -oso-prepend-path %p/.. -dump-debug-map %p/../Inputs/global_downgraded_to_static.x86_64 2>&1 | FileCheck %s
+//
+//  To build:
+//    clang -g -c -DFILE1 global_downgraded_to_static.c -o 1.o
+//    clang -g -c -DFILE2 global_downgraded_to_static.c -o 2.o
+//    ld -r -exported_symbol _foo 1.o -o 1.r.o
+//    clang 1.r.o 2.o -o global_downgraded_to_static.x86_64
+
+#if defined(FILE1)
+int global_to_become_static = 42;
+// CHECK: sym: _global_to_become_static,
+// CHECK-SAME: binAddr: 0x0000000100001000
+int foo() {
+  return global_to_become_static;
+}
+#elif defined(FILE2)
+int foo(void);
+int main() {
+  return foo();
+}
+#else
+#error Define FILE1 or FILE2
+#endif

diff --git a/llvm/tools/dsymutil/MachODebugMapParser.cpp b/llvm/tools/dsymutil/MachODebugMapParser.cpp
index 48155b4..d696e1d 100644 (file)
--- a/llvm/tools/dsymutil/MachODebugMapParser.cpp
+++ b/llvm/tools/dsymutil/MachODebugMapParser.cpp
@@ -511,14 +511,16 @@ void MachODebugMapParser::loadMainBinarySymbols(
     // Skip undefined and STAB entries.
     if ((Type == SymbolRef::ST_Debug) || (Type == SymbolRef::ST_Unknown))
       continue;
-    // The only symbols of interest are the global variables. These
-    // are the only ones that need to be queried because the address
-    // of common data won't be described in the debug map. All other
-    // addresses should be fetched for the debug map.
+    // In theory, the only symbols of interest are the global variables. These
+    // are the only ones that need to be queried because the address of common
+    // data won't be described in the debug map. All other addresses should be
+    // fetched for the debug map. In reality, by playing with 'ld -r' and
+    // export lists, you can get symbols described as N_GSYM in the debug map,
+    // but associated with a local symbol. Gather all the symbols, but prefer
+    // the global ones.
     uint8_t SymType =
         MainBinary.getSymbolTableEntry(Sym.getRawDataRefImpl()).n_type;
-    if (!(SymType & (MachO::N_EXT | MachO::N_PEXT)))
-      continue;
+    bool Extern = SymType & (MachO::N_EXT | MachO::N_PEXT);
     Expected<section_iterator> SectionOrErr = Sym.getSection();
     if (!SectionOrErr) {
       // TODO: Actually report errors helpfully.
@@ -538,7 +540,11 @@ void MachODebugMapParser::loadMainBinarySymbols(
     StringRef Name = *NameOrErr;
     if (Name.size() == 0 || Name[0] == '\0')
       continue;
-    MainBinarySymbolAddresses[Name] = Addr;
+    // Override only if the new key is global.
+    if (Extern)
+      MainBinarySymbolAddresses[Name] = Addr;
+    else
+      MainBinarySymbolAddresses.try_emplace(Name, Addr);
   }
 }