From aa537da89f0b51e2a6c1b317da0b11fcedd5025e Mon Sep 17 00:00:00 2001
From: David Blaikie <dblaikie@gmail.com>
Date: Tue, 1 May 2018 18:08:45 +0000
Subject: [PATCH] llvm-symbolizer: Handle function definitions nested within
 other functions

LLVM always puts function definition DIEs at the top level, but under
some circumstances GCC does not (at least in this case with member
functions of a function-local type).

To ensure that doesn't appear as though the local type's member function
is unduly inlined within the outer function - ensure the inline
discovery DIE parent walk stops at the first DW_TAG_subprogram.

llvm-svn: 331291
---
 llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp           |   8 ++++++--
 ...llvm-symbolizer-local-mem-func-gcc.elf-x86-64 | Bin 0 -> 9416 bytes
 llvm/test/DebugInfo/llvm-symbolizer.test         |   5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100755 llvm/test/DebugInfo/Inputs/llvm-symbolizer-local-mem-func-gcc.elf-x86-64

diff --git a/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp b/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
index 884d3bbca59d..d54275d302f3 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
@@ -415,11 +415,15 @@ DWARFUnit::getInlinedChainForAddress(uint64_t Address,
   DWARFDie SubroutineDIE =
       (DWO ? DWO.get() : this)->getSubroutineForAddress(Address);
 
-  while (SubroutineDIE) {
-    if (SubroutineDIE.isSubroutineDIE())
+  if (!SubroutineDIE)
+    return;
+
+  while (!SubroutineDIE.isSubprogramDIE()) {
+    if (SubroutineDIE.getTag() == DW_TAG_inlined_subroutine)
       InlinedChain.push_back(SubroutineDIE);
     SubroutineDIE  = SubroutineDIE.getParent();
   }
+  InlinedChain.push_back(SubroutineDIE);
 }
 
 const DWARFUnitIndex &llvm::getDWARFUnitIndex(DWARFContext &Context,
diff --git a/llvm/test/DebugInfo/Inputs/llvm-symbolizer-local-mem-func-gcc.elf-x86-64 b/llvm/test/DebugInfo/Inputs/llvm-symbolizer-local-mem-func-gcc.elf-x86-64
new file mode 100755
index 0000000000000000000000000000000000000000..39be2996d451aea55029bbd91d3357d3f6e1a135
GIT binary patch
literal 9416
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

literal 0
HcmV?d00001

diff --git a/llvm/test/DebugInfo/llvm-symbolizer.test b/llvm/test/DebugInfo/llvm-symbolizer.test
index 1fcc61cbdf97..a6a15491c205 100644
--- a/llvm/test/DebugInfo/llvm-symbolizer.test
+++ b/llvm/test/DebugInfo/llvm-symbolizer.test
@@ -20,6 +20,7 @@ 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: echo "%p/Inputs/llvm-symbolizer-local-mem-func-gcc.elf-x86-64 0x61a" >> %t.input
 RUN: echo "%p/Inputs/fission-ranges.elf-x86_64 0x720" >> %t.input
 RUN: echo "%p/Inputs/arange-overlap.elf-x86_64 0x714" >> %t.input
 RUN: cp %p/Inputs/split-dwarf-test.dwo %t
@@ -127,6 +128,10 @@ CHECK:      _Z3inci
 CHECK: main
 CHECK-NEXT: llvm-symbolizer-dwo-test.cc:11
 
+CHECK-NOT: local_mem_func
+CHECK: _ZZ2f1vEN3foo14local_mem_funcEv
+CHECK-NEXT: {{.*}}local-mem-func.cpp:3:0
+
 CHECK: main
 CHECK-NEXT: {{.*}}fission-ranges.cc:6