[llvm] r235900 - Make llvm-symbolizer work on Windows.
Zachary Turner
zturner at google.com
Mon Apr 27 10:19:52 PDT 2015
Author: zturner
Date: Mon Apr 27 12:19:51 2015
New Revision: 235900
URL: http://llvm.org/viewvc/llvm-project?rev=235900&view=rev
Log:
Make llvm-symbolizer work on Windows.
Differential Revision: http://reviews.llvm.org/D9234
Reviewed By: Alexey Samsonov
Added:
llvm/trunk/include/llvm/DebugInfo/PDB/PDBContext.h
llvm/trunk/lib/DebugInfo/PDB/PDBContext.cpp
llvm/trunk/test/tools/llvm-symbolizer/pdb/
llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/
llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.c
llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.exe
llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.exe.input
llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.pdb
llvm/trunk/test/tools/llvm-symbolizer/pdb/lit.local.cfg
llvm/trunk/test/tools/llvm-symbolizer/pdb/pdb.test
Modified:
llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt
llvm/trunk/tools/llvm-symbolizer/CMakeLists.txt
llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp
llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp
Added: llvm/trunk/include/llvm/DebugInfo/PDB/PDBContext.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/PDBContext.h?rev=235900&view=auto
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/PDBContext.h (added)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/PDBContext.h Mon Apr 27 12:19:51 2015
@@ -0,0 +1,58 @@
+//===-- PDBContext.h --------------------------------------------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===/
+
+#ifndef LLVM_DEBUGINFO_PDB_PDBCONTEXT_H
+#define LLVM_DEBUGINFO_PDB_PDBCONTEXT_H
+
+#include "llvm/DebugInfo/DIContext.h"
+#include "llvm/DebugInfo/PDB/IPDBSession.h"
+
+namespace llvm {
+
+namespace object {
+class COFFObjectFile;
+}
+
+/// PDBContext
+/// This data structure is the top level entity that deals with PDB debug
+/// information parsing. This data structure exists only when there is a
+/// need for a transparent interface to different debug information formats
+/// (e.g. PDB and DWARF). More control and power over the debug information
+/// access can be had by using the PDB interfaces directly.
+class PDBContext : public DIContext {
+
+ PDBContext(PDBContext &) = delete;
+ PDBContext &operator=(PDBContext &) = delete;
+
+public:
+ PDBContext(const object::COFFObjectFile &Object,
+ std::unique_ptr<IPDBSession> PDBSession);
+
+ static bool classof(const DIContext *DICtx) {
+ return DICtx->getKind() == CK_PDB;
+ }
+
+ void dump(raw_ostream &OS, DIDumpType DumpType = DIDT_All) override;
+
+ DILineInfo getLineInfoForAddress(
+ uint64_t Address,
+ DILineInfoSpecifier Specifier = DILineInfoSpecifier()) override;
+ DILineInfoTable getLineInfoForAddressRange(
+ uint64_t Address, uint64_t Size,
+ DILineInfoSpecifier Specifier = DILineInfoSpecifier()) override;
+ DIInliningInfo getInliningInfoForAddress(
+ uint64_t Address,
+ DILineInfoSpecifier Specifier = DILineInfoSpecifier()) override;
+
+private:
+ std::unique_ptr<IPDBSession> Session;
+};
+}
+
+#endif
Modified: llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt?rev=235900&r1=235899&r2=235900&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt (original)
+++ llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt Mon Apr 27 12:19:51 2015
@@ -32,6 +32,7 @@ list(APPEND LIBPDB_ADDITIONAL_HEADER_DIR
add_llvm_library(LLVMDebugInfoPDB
IPDBSourceFile.cpp
PDB.cpp
+ PDBContext.cpp
PDBExtras.cpp
PDBInterfaceAnchors.cpp
PDBSymbol.cpp
Added: llvm/trunk/lib/DebugInfo/PDB/PDBContext.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/PDBContext.cpp?rev=235900&view=auto
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/PDBContext.cpp (added)
+++ llvm/trunk/lib/DebugInfo/PDB/PDBContext.cpp Mon Apr 27 12:19:51 2015
@@ -0,0 +1,103 @@
+//===-- PDBContext.cpp ------------------------------------------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===/
+
+#include "llvm/DebugInfo/PDB/PDBContext.h"
+#include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
+#include "llvm/DebugInfo/PDB/IPDBLineNumber.h"
+#include "llvm/DebugInfo/PDB/IPDBSourceFile.h"
+#include "llvm/DebugInfo/PDB/PDBSymbol.h"
+#include "llvm/DebugInfo/PDB/PDBSymbolFunc.h"
+#include "llvm/DebugInfo/PDB/PDBSymbolData.h"
+#include "llvm/Object/COFF.h"
+
+using namespace llvm;
+using namespace llvm::object;
+
+PDBContext::PDBContext(const COFFObjectFile &Object,
+ std::unique_ptr<IPDBSession> PDBSession)
+ : DIContext(CK_PDB), Session(std::move(PDBSession)) {
+ uint64_t ImageBase = 0;
+ if (Object.is64()) {
+ const pe32plus_header *Header = nullptr;
+ Object.getPE32PlusHeader(Header);
+ if (Header)
+ ImageBase = Header->ImageBase;
+ } else {
+ const pe32_header *Header = nullptr;
+ Object.getPE32Header(Header);
+ if (Header)
+ ImageBase = static_cast<uint64_t>(Header->ImageBase);
+ }
+ Session->setLoadAddress(ImageBase);
+}
+
+void PDBContext::dump(raw_ostream &OS, DIDumpType DumpType) {}
+
+DILineInfo PDBContext::getLineInfoForAddress(uint64_t Address,
+ DILineInfoSpecifier Specifier) {
+ auto Symbol = Session->findSymbolByAddress(Address);
+
+ uint32_t Length = 1;
+ DILineInfo Result;
+ if (auto Func = dyn_cast_or_null<PDBSymbolFunc>(Symbol.get())) {
+ if (Specifier.FNKind == DINameKind::LinkageName)
+ Result.FunctionName = Func->getUndecoratedName();
+ else if (Specifier.FNKind == DINameKind::ShortName)
+ Result.FunctionName = Func->getName();
+
+ Length = Func->getLength();
+ } else if (auto Data = dyn_cast_or_null<PDBSymbolData>(Symbol.get())) {
+ Length = Data->getLength();
+ }
+
+ // If we couldn't find a symbol, then just assume 1 byte, so that we get
+ // only the line number of the first instruction.
+ auto LineNumbers = Session->findLineNumbersByAddress(Address, Length);
+ if (!LineNumbers || LineNumbers->getChildCount() == 0)
+ return Result;
+
+ auto LineInfo = LineNumbers->getNext();
+ assert(LineInfo);
+ auto SourceFile = Session->getSourceFileById(LineInfo->getSourceFileId());
+
+ if (SourceFile &&
+ Specifier.FLIKind != DILineInfoSpecifier::FileLineInfoKind::None)
+ Result.FileName = SourceFile->getFileName();
+ Result.Column = LineInfo->getColumnNumber();
+ Result.Line = LineInfo->getLineNumber();
+ return Result;
+}
+
+DILineInfoTable
+PDBContext::getLineInfoForAddressRange(uint64_t Address, uint64_t Size,
+ DILineInfoSpecifier Specifier) {
+ if (Size == 0)
+ return DILineInfoTable();
+
+ DILineInfoTable Table;
+ auto LineNumbers = Session->findLineNumbersByAddress(Address, Size);
+ if (!LineNumbers || LineNumbers->getChildCount() == 0)
+ return Table;
+
+ while (auto LineInfo = LineNumbers->getNext()) {
+ DILineInfo LineEntry =
+ getLineInfoForAddress(LineInfo->getVirtualAddress(), Specifier);
+ Table.push_back(std::make_pair(LineInfo->getVirtualAddress(), LineEntry));
+ }
+ return Table;
+}
+
+DIInliningInfo
+PDBContext::getInliningInfoForAddress(uint64_t Address,
+ DILineInfoSpecifier Specifier) {
+ DIInliningInfo InlineInfo;
+ DILineInfo Frame = getLineInfoForAddress(Address, Specifier);
+ InlineInfo.addFrame(Frame);
+ return InlineInfo;
+}
Added: llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.c?rev=235900&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.c (added)
+++ llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.c Mon Apr 27 12:19:51 2015
@@ -0,0 +1,8 @@
+// To generate the corresponding EXE/PDB, run:
+// cl /Zi test.c
+void foo() {
+}
+
+int main() {
+ foo();
+}
Added: llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.exe
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.exe?rev=235900&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.exe (added) and llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.exe Mon Apr 27 12:19:51 2015 differ
Added: llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.exe.input
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.exe.input?rev=235900&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.exe.input (added)
+++ llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.exe.input Mon Apr 27 12:19:51 2015
@@ -0,0 +1,3 @@
+0x401020
+0x401030
+0x500000
Added: llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.pdb
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.pdb?rev=235900&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.pdb (added) and llvm/trunk/test/tools/llvm-symbolizer/pdb/Inputs/test.pdb Mon Apr 27 12:19:51 2015 differ
Added: llvm/trunk/test/tools/llvm-symbolizer/pdb/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/pdb/lit.local.cfg?rev=235900&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-symbolizer/pdb/lit.local.cfg (added)
+++ llvm/trunk/test/tools/llvm-symbolizer/pdb/lit.local.cfg Mon Apr 27 12:19:51 2015
@@ -0,0 +1 @@
+config.unsupported = not config.have_dia_sdk
Added: llvm/trunk/test/tools/llvm-symbolizer/pdb/pdb.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/pdb/pdb.test?rev=235900&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-symbolizer/pdb/pdb.test (added)
+++ llvm/trunk/test/tools/llvm-symbolizer/pdb/pdb.test Mon Apr 27 12:19:51 2015
@@ -0,0 +1,8 @@
+RUN: llvm-symbolizer -obj="%p/Inputs/test.exe" < "%p/Inputs/test.exe.input" | FileCheck %s --check-prefix=CHECK
+
+CHECK: _foo
+CHECK-NEXT: test.c:3:0
+CHECK: _main
+CHECK-NEXT: test.c:6:0
+CHECK: ??
+CHECK-NEXT: ??:0:0
Modified: llvm/trunk/tools/llvm-symbolizer/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-symbolizer/CMakeLists.txt?rev=235900&r1=235899&r2=235900&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-symbolizer/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-symbolizer/CMakeLists.txt Mon Apr 27 12:19:51 2015
@@ -5,6 +5,7 @@
set(LLVM_LINK_COMPONENTS
DebugInfoDWARF
+ DebugInfoPDB
Object
Support
)
Modified: llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp?rev=235900&r1=235899&r2=235900&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp (original)
+++ llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp Mon Apr 27 12:19:51 2015
@@ -15,6 +15,8 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/Config/config.h"
#include "llvm/DebugInfo/DWARF/DWARFContext.h"
+#include "llvm/DebugInfo/PDB/PDB.h"
+#include "llvm/DebugInfo/PDB/PDBContext.h"
#include "llvm/Object/ELFObjectFile.h"
#include "llvm/Object/MachO.h"
#include "llvm/Support/Casting.h"
@@ -164,6 +166,7 @@ DILineInfo ModuleInfo::symbolizeCode(
DIInliningInfo ModuleInfo::symbolizeInlinedCode(
uint64_t ModuleOffset, const LLVMSymbolizer::Options &Opts) const {
DIInliningInfo InlinedContext;
+
if (DebugInfoContext) {
InlinedContext = DebugInfoContext->getInliningInfoForAddress(
ModuleOffset, getDILineInfoSpecifier(Opts));
@@ -461,7 +464,18 @@ LLVMSymbolizer::getOrCreateModuleInfo(co
Modules.insert(make_pair(ModuleName, (ModuleInfo *)nullptr));
return nullptr;
}
- DIContext *Context = new DWARFContextInMemory(*Objects.second);
+ DIContext *Context = nullptr;
+ if (auto CoffObject = dyn_cast<COFFObjectFile>(Objects.first)) {
+ // If this is a COFF object, assume it contains PDB debug information. If
+ // we don't find any we will fall back to the DWARF case.
+ std::unique_ptr<IPDBSession> Session;
+ PDB_ErrorCode Error = loadDataForEXE(PDB_ReaderType::DIA,
+ Objects.first->getFileName(), Session);
+ if (Error == PDB_ErrorCode::Success)
+ Context = new PDBContext(*CoffObject, std::move(Session));
+ }
+ if (!Context)
+ Context = new DWARFContextInMemory(*Objects.second);
assert(Context);
ModuleInfo *Info = new ModuleInfo(Objects.first, Context);
Modules.insert(make_pair(ModuleName, Info));
Modified: llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp?rev=235900&r1=235899&r2=235900&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp (original)
+++ llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp Mon Apr 27 12:19:51 2015
@@ -17,6 +17,7 @@
#include "LLVMSymbolize.h"
#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/COM.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/FileSystem.h"
@@ -123,6 +124,8 @@ int main(int argc, char **argv) {
PrettyStackTraceProgram X(argc, argv);
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
+ llvm::sys::InitializeCOMRAII COM(llvm::sys::COMThreadingMode::MultiThreaded);
+
cl::ParseCommandLineOptions(argc, argv, "llvm-symbolizer\n");
LLVMSymbolizer::Options Opts(ClUseSymbolTable, ClPrintFunctions,
ClPrintInlining, ClDemangle, ClDefaultArch);
@@ -146,5 +149,6 @@ int main(int argc, char **argv) {
outs() << Result << "\n";
outs().flush();
}
+
return 0;
}
More information about the llvm-commits
mailing list