From 54543afeba0c7434b74f4f61bb39f12b3779414c Mon Sep 17 00:00:00 2001
From: Alexey Samsonov <vonosmas@gmail.com>
Date: Fri, 5 Sep 2014 19:29:45 +0000
Subject: [PATCH] [DWARF parser] Fix nasty memory corruption in .dwo files
 handling.

Forge a test case where llvm-symbolizer has to use external .dwo
file to produce the inlining information.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217270 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/DebugInfo/DWARFUnit.cpp                |  20 +++++++++-----------
 lib/DebugInfo/DWARFUnit.h                  |   4 ++--
 test/DebugInfo/Inputs/split-dwarf-test     | Bin 0 -> 9379 bytes
 test/DebugInfo/Inputs/split-dwarf-test.cc  |  17 +++++++++++++++++
 test/DebugInfo/Inputs/split-dwarf-test.dwo | Bin 0 -> 1609 bytes
 test/DebugInfo/llvm-symbolizer.test        |  13 +++++++++++++
 6 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100755 test/DebugInfo/Inputs/split-dwarf-test
 create mode 100644 test/DebugInfo/Inputs/split-dwarf-test.cc
 create mode 100644 test/DebugInfo/Inputs/split-dwarf-test.dwo

diff --git a/lib/DebugInfo/DWARFUnit.cpp b/lib/DebugInfo/DWARFUnit.cpp
index fe75ebe2dc5..2bb7933e88b 100644
--- a/lib/DebugInfo/DWARFUnit.cpp
+++ b/lib/DebugInfo/DWARFUnit.cpp
@@ -235,11 +235,14 @@ size_t DWARFUnit::extractDIEsIfNeeded(bool CUDieOnly) {
   return DieArray.size();
 }
 
-DWARFUnit::DWOHolder::DWOHolder(std::unique_ptr<object::ObjectFile> DWOFile)
-    : DWOFile(std::move(DWOFile)),
-      DWOContext(
-          cast<DWARFContext>(DIContext::getDWARFContext(*this->DWOFile))),
-      DWOU(nullptr) {
+DWARFUnit::DWOHolder::DWOHolder(StringRef DWOPath)
+    : DWOFile(), DWOContext(), DWOU(nullptr) {
+  auto Obj = object::ObjectFile::createObjectFile(DWOPath);
+  if (!Obj)
+    return;
+  DWOFile = std::move(Obj.get());
+  DWOContext.reset(
+      cast<DWARFContext>(DIContext::getDWARFContext(*DWOFile.getBinary())));
   if (DWOContext->getNumDWOCompileUnits() > 0)
     DWOU = DWOContext->getDWOCompileUnitAtIndex(0);
 }
@@ -261,12 +264,7 @@ bool DWARFUnit::parseDWO() {
     sys::path::append(AbsolutePath, CompilationDir);
   }
   sys::path::append(AbsolutePath, DWOFileName);
-  ErrorOr<object::OwningBinary<object::ObjectFile>> DWOFile =
-      object::ObjectFile::createObjectFile(AbsolutePath);
-  if (!DWOFile)
-    return false;
-  // Reset DWOHolder.
-  DWO = llvm::make_unique<DWOHolder>(std::move(DWOFile->getBinary()));
+  DWO = llvm::make_unique<DWOHolder>(AbsolutePath);
   DWARFUnit *DWOCU = DWO->getUnit();
   // Verify that compile unit in .dwo file is valid.
   if (!DWOCU || DWOCU->getDWOId() != getDWOId()) {
diff --git a/lib/DebugInfo/DWARFUnit.h b/lib/DebugInfo/DWARFUnit.h
index 763caddb9d7..ba26d55a1dd 100644
--- a/lib/DebugInfo/DWARFUnit.h
+++ b/lib/DebugInfo/DWARFUnit.h
@@ -51,11 +51,11 @@ class DWARFUnit {
   std::vector<DWARFDebugInfoEntryMinimal> DieArray;
 
   class DWOHolder {
-    std::unique_ptr<object::ObjectFile> DWOFile;
+    object::OwningBinary<object::ObjectFile> DWOFile;
     std::unique_ptr<DWARFContext> DWOContext;
     DWARFUnit *DWOU;
   public:
-    DWOHolder(std::unique_ptr<object::ObjectFile> DWOFile);
+    DWOHolder(StringRef DWOPath);
     DWARFUnit *getUnit() const { return DWOU; }
   };
   std::unique_ptr<DWOHolder> DWO;
diff --git a/test/DebugInfo/Inputs/split-dwarf-test b/test/DebugInfo/Inputs/split-dwarf-test
new file mode 100755
index 0000000000000000000000000000000000000000..a4411129a9b677d643c68bd8991f8a4d69a5a7b8
GIT binary patch
literal 9379
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

literal 0
HcmV?d00001

diff --git a/test/DebugInfo/Inputs/split-dwarf-test.cc b/test/DebugInfo/Inputs/split-dwarf-test.cc
new file mode 100644
index 00000000000..5ed56f94b36
--- /dev/null
+++ b/test/DebugInfo/Inputs/split-dwarf-test.cc
@@ -0,0 +1,17 @@
+int foo(int a) {
+  return a + 1;
+}
+
+int main(int argc, char *argv[]) {
+  return foo(argc);
+}
+
+// Build instructions:
+// 1) clang++ -### -O2 -gsplit-dwarf.cc split-dwarf-test.cc -o split-dwarf-test
+// 2) Replace the value "-fdebug-compilation-dir" flag to "Output"
+//      (this is the temp directory used by lit).
+// 3) Manually run clang-cc1, objcopy and ld invocations.
+// 4) Copy the binary and .dwo file to the Inputs directory. Make sure the
+//    .dwo file will be available for symbolizer (use test RUN-lines to copy
+//    the .dwo file to a directory
+//    <execution_directory>/<directory_provided_in_fdebug_compilation_dir>.
diff --git a/test/DebugInfo/Inputs/split-dwarf-test.dwo b/test/DebugInfo/Inputs/split-dwarf-test.dwo
new file mode 100644
index 0000000000000000000000000000000000000000..74183a4b622fbce4e7163fdc4b8ca37026265aff
GIT binary patch
literal 1609
zcmbtUOKTHR6h3!ec}!Gd7A8nB3&j@ckXW$R$22NR3+loLt%8KfWReb~Gi7E>shiLU
zTF`~i{~@?@Be-<wKM+?gUAl1NIWu?C@ixVU7tZTD-+AOtxTD*5??{Y6dKj2+5Tz)<
z7wN!n#cm69$irLol{n5bblAi9g`abu&cBdil&u+<lPQ0hlp@KD-9U$_YT|&Vs7j7e
z3$~^)m6G`qs$Ak1*rPmCcM&L3D~WnBO_v|<D{)6Cy+Wk)29;LO7_c%sH#RG(JT||N
zY9DUqu*P8JUGt>Ys{R<&nibqf1?dzyiossD#wK#F=vVdC%5tr)1E?xY5bS!EB2(8f
zlgoCRaF%PhGPRr_00oSznYcK^nw5Bqb^Qr;(kV|Xlup1Z8n6eJ*RKzqAas4NzF=H3
z8ui(W&Bf;8(j0_a12>xQZd*ZbK61jyux)5RUFi9~3#h>LBCuf7ay_tuzD;Tf_J$QC
zSC1O63*`8_CO%Gt8I&f<63TTHy82rvD=7C+9-tgUkpM3d82f#k8W`cuW@L5HMnPgX
zQm^ZDp7-0X*Yl0;whu-UM>|_im<6m(Cvb*Y1RG?-fp2F+%(nerFLa{6+6-LJiD|gh
z|DV&?BEBD?Rg1^(1YG1^z`Tf2$ycE+4MpxXOo$k9)B2BTA-5v;KH`Km1l}Get_gTr
zpW0`<UZBA@PN)irv@V4QN7Vn~#MzX{tyur^i25`9-6{X0p7QZKBk&r$eqX@F`4nfK
zxCwhtP2A5MDWc7DAt=3<0{YYDuV}<N{B6bg32VBRr~Wf&-n5MgpSB6%$xAIxk%9k6
PAt3`_{t!+Nf^hx-n(v5e

literal 0
HcmV?d00001

diff --git a/test/DebugInfo/llvm-symbolizer.test b/test/DebugInfo/llvm-symbolizer.test
index 20d3dda21ab..fdd64d69f5b 100644
--- a/test/DebugInfo/llvm-symbolizer.test
+++ b/test/DebugInfo/llvm-symbolizer.test
@@ -19,10 +19,15 @@ 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/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
+RUN: echo "%p/Inputs/split-dwarf-test 0x4004d0" >> %t.input
+RUN: echo "%p/Inputs/split-dwarf-test 0x4004c0" >> %t.input
 
 RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \
 RUN:    --default-arch=i386 < %t.input | FileCheck %s
 
+REQUIRES: shell
+
 CHECK:       main
 CHECK-NEXT: /tmp/dbginfo{{[/\\]}}dwarfdump-test.cc:16
 
@@ -98,6 +103,14 @@ CHECK-NEXT: {{.*}}fission-ranges.cc:6
 CHECK: _ZN1S3bazEv
 CHECK-NEXT: {{.*}}arange-overlap.cc:6
 
+CHECK: _Z3fooi
+CHECK-NEXT: {{.*}}split-dwarf-test.cc
+CHECK-NEXT: main
+CHECK-NEXT: {{.*}}split-dwarf-test.cc
+
+CHECK: _Z3fooi
+CHECK-NEXT: {{.*}}split-dwarf-test.cc
+
 RUN: echo "unexisting-file 0x1234" > %t.input2
 RUN: llvm-symbolizer < %t.input2
 
-- 
2.34.1