From e0d2d7fb26a2dac464f6e245594176a2a7f1ccf7 Mon Sep 17 00:00:00 2001
From: Alexey Samsonov <samsonov@google.com>
Date: Fri, 18 Apr 2014 22:22:44 +0000
Subject: [PATCH] [llvm-symbolizer] Print file/line for a PC even if there is
 no DIE describing it.

This is important for symbolizing executables with debug info in
unavailable .dwo files. Even if all DIE entries are missing, we can
still symbolize an address: function name can be fetched from symbol table,
and file/line info can be fetched from line table.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206665 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/DebugInfo/DWARFContext.cpp                |  29 ++++++++++++------
 .../DebugInfo/Inputs/llvm-symbolizer-dwo-test | Bin 0 -> 9579 bytes
 .../Inputs/llvm-symbolizer-dwo-test.cc        |  18 +++++++++++
 test/DebugInfo/llvm-symbolizer.test           |   4 +++
 4 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100755 test/DebugInfo/Inputs/llvm-symbolizer-dwo-test
 create mode 100644 test/DebugInfo/Inputs/llvm-symbolizer-dwo-test.cc

diff --git a/lib/DebugInfo/DWARFContext.cpp b/lib/DebugInfo/DWARFContext.cpp
index 50ec4d3cb47..148d56800f8 100644
--- a/lib/DebugInfo/DWARFContext.cpp
+++ b/lib/DebugInfo/DWARFContext.cpp
@@ -545,18 +545,32 @@ DILineInfoTable DWARFContext::getLineInfoForAddressRange(uint64_t Address,
 
 DIInliningInfo DWARFContext::getInliningInfoForAddress(uint64_t Address,
     DILineInfoSpecifier Specifier) {
+  DIInliningInfo InliningInfo;
+
   DWARFCompileUnit *CU = getCompileUnitForAddress(Address);
   if (!CU)
-    return DIInliningInfo();
+    return InliningInfo;
 
+  const DWARFLineTable *LineTable = nullptr;
+  const bool NeedsAbsoluteFilePath =
+      Specifier.needs(DILineInfoSpecifier::AbsoluteFilePath);
   const DWARFDebugInfoEntryInlinedChain &InlinedChain =
       CU->getInlinedChainForAddress(Address);
-  if (InlinedChain.DIEs.size() == 0)
-    return DIInliningInfo();
+  if (InlinedChain.DIEs.size() == 0) {
+    // If there is no DIE for address (e.g. it is in unavailable .dwo file),
+    // try to at least get file/line info from symbol table.
+    if (Specifier.needs(DILineInfoSpecifier::FileLineInfo)) {
+      DILineInfo Frame;
+      LineTable = getLineTableForCompileUnit(CU);
+      if (getFileLineInfoForCompileUnit(CU, LineTable, Address,
+                                        NeedsAbsoluteFilePath, Frame)) {
+        InliningInfo.addFrame(Frame);
+      }
+    }
+    return InliningInfo;
+  }
 
-  DIInliningInfo InliningInfo;
   uint32_t CallFile = 0, CallLine = 0, CallColumn = 0;
-  const DWARFLineTable *LineTable = nullptr;
   for (uint32_t i = 0, n = InlinedChain.DIEs.size(); i != n; i++) {
     const DWARFDebugInfoEntryMinimal &FunctionDIE = InlinedChain.DIEs[i];
     DILineInfo Frame;
@@ -566,16 +580,13 @@ DIInliningInfo DWARFContext::getInliningInfoForAddress(uint64_t Address,
         Frame.FunctionName = Name;
     }
     if (Specifier.needs(DILineInfoSpecifier::FileLineInfo)) {
-      const bool NeedsAbsoluteFilePath =
-          Specifier.needs(DILineInfoSpecifier::AbsoluteFilePath);
       if (i == 0) {
         // For the topmost frame, initialize the line table of this
         // compile unit and fetch file/line info from it.
         LineTable = getLineTableForCompileUnit(CU);
         // For the topmost routine, get file/line info from line table.
         getFileLineInfoForCompileUnit(CU, LineTable, Address,
-                                      NeedsAbsoluteFilePath,
-                                      Frame);
+                                      NeedsAbsoluteFilePath, Frame);
       } else {
         // Otherwise, use call file, call line and call column from
         // previous DIE in inlined chain.
diff --git a/test/DebugInfo/Inputs/llvm-symbolizer-dwo-test b/test/DebugInfo/Inputs/llvm-symbolizer-dwo-test
new file mode 100755
index 0000000000000000000000000000000000000000..c28c3d277a7c18b3c907438d41d9940206fb7b95
GIT binary patch
literal 9579
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

literal 0
HcmV?d00001

diff --git a/test/DebugInfo/Inputs/llvm-symbolizer-dwo-test.cc b/test/DebugInfo/Inputs/llvm-symbolizer-dwo-test.cc
new file mode 100644
index 00000000000..ea0967a263a
--- /dev/null
+++ b/test/DebugInfo/Inputs/llvm-symbolizer-dwo-test.cc
@@ -0,0 +1,18 @@
+int f(int a, int b) {
+  return a + b;
+}
+
+int g(int a) {
+  return a + 1;
+}
+
+
+int main() {
+  return f(2, g(2));
+}
+
+// Built with Clang 3.5.0:
+// $ mkdir -p /tmp/dbginfo
+// $ cp llvm-symbolizer-dwo-test.cc /tmp/dbginfo
+// $ cd /tmp/dbginfo
+// $ clang -gsplit-dwarf llvm-symbolizer-dwo-test.cc
diff --git a/test/DebugInfo/llvm-symbolizer.test b/test/DebugInfo/llvm-symbolizer.test
index 4b532f3e4aa..6d51fe96c48 100644
--- a/test/DebugInfo/llvm-symbolizer.test
+++ b/test/DebugInfo/llvm-symbolizer.test
@@ -8,6 +8,7 @@ RUN: echo "\"%p/Inputs/dwarfdump-test3.elf-x86-64 space\" 0x633" >> %t.input
 RUN: echo "%p/Inputs/macho-universal 0x1f84" >> %t.input
 RUN: echo "%p/Inputs/macho-universal:i386 0x1f67" >> %t.input
 RUN: echo "%p/Inputs/macho-universal:x86_64 0x100000f05" >> %t.input
+RUN: echo "%p/Inputs/llvm-symbolizer-dwo-test 0x400514" >> %t.input
 
 RUN: llvm-symbolizer --functions --inlining --demangle=false \
 RUN:    --default-arch=i386 < %t.input | FileCheck %s
@@ -48,6 +49,9 @@ CHECK:      main
 CHECK:      _Z3inci
 CHECK:      _Z3inci
 
+CHECK: main
+CHECK-NEXT: llvm-symbolizer-dwo-test.cc:11
+
 RUN: echo "unexisting-file 0x1234" > %t.input2
 RUN: llvm-symbolizer < %t.input2
 
-- 
2.34.1