summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1455ac7)
raw | patch | inline | side by side (parent: 1455ac7)
author | Alexey Samsonov <vonosmas@gmail.com> | |
Fri, 5 Sep 2014 19:29:45 +0000 (19:29 +0000) | ||
committer | Alexey Samsonov <vonosmas@gmail.com> | |
Fri, 5 Sep 2014 19:29:45 +0000 (19:29 +0000) |
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
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 | patch | blob | history | |
lib/DebugInfo/DWARFUnit.h | patch | blob | history | |
test/DebugInfo/Inputs/split-dwarf-test | [new file with mode: 0755] | patch | blob |
test/DebugInfo/Inputs/split-dwarf-test.cc | [new file with mode: 0644] | patch | blob |
test/DebugInfo/Inputs/split-dwarf-test.dwo | [new file with mode: 0644] | patch | blob |
test/DebugInfo/llvm-symbolizer.test | patch | blob | history |
index fe75ebe2dc58e3fb58171b86be133c4d1f12b185..2bb7933e88bd7141eb8e705e064657d002f80e51 100644 (file)
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);
}
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()) {
index 763caddb9d7df59f61b4cf1cf849b75da328cd0b..ba26d55a1dd7501fece735015a2283b3a5eac93b 100644 (file)
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 (executable)
index 0000000..a441112
Binary files /dev/null and b/test/DebugInfo/Inputs/split-dwarf-test differ
index 0000000..a441112
Binary files /dev/null and b/test/DebugInfo/Inputs/split-dwarf-test differ
diff --git a/test/DebugInfo/Inputs/split-dwarf-test.cc b/test/DebugInfo/Inputs/split-dwarf-test.cc
--- /dev/null
@@ -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 (file)
index 0000000..74183a4
Binary files /dev/null and b/test/DebugInfo/Inputs/split-dwarf-test.dwo differ
index 0000000..74183a4
Binary files /dev/null and b/test/DebugInfo/Inputs/split-dwarf-test.dwo differ
index 20d3dda21ab0d79a67bd164e080349433c058658..fdd64d69f5b300306573eb6e4fe5f7f75fb5e8b9 100644 (file)
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
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