maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[llvm-pdbutil] Fix some dumping issues. 

When dumping, we were treating the S_INLINESITESYM as referring
to a type record, when it actually refers to an id record.  We
had this correct in TypeIndexDiscovery, so our merging algorithm
should be fine, but we had it wrong in the dumper, which means it
would appear to work most of the time, unless the index was out
of bounds in the type stream, when it would fail.  Fixed this, and
audited a few other cases to make them match the behavior in
TypeIndexDiscovery.

Also, I've now observed a new symbol record with kind 0x1168 which
I have no clue what it is, so to avoid crashing we have to just
print "Unknown Symbol Kind".

llvm-svn: 311117
This commit is contained in:
Zachary Turner 2017-08-17 20:04:51 +00:00
parent f401e1102d
commit 96bcd6a37a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/DebugInfo/CodeView/LazyRandomTypeCollection.cpp
View File

@ -83,7 +83,9 @@ uint32_t LazyRandomTypeCollection::getOffsetOfType(TypeIndex Index) {
} }
CVType LazyRandomTypeCollection::getType(TypeIndex Index) { CVType LazyRandomTypeCollection::getType(TypeIndex Index) {
error(ensureTypeExists(Index)); uint32_t I = Index.getIndex();
auto EC = ensureTypeExists(Index);
error(std::move(EC));
assert(contains(Index)); assert(contains(Index));
return Records[Index.toArrayIndex()].Type; return Records[Index.toArrayIndex()].Type;

13
llvm/tools/llvm-pdbutil/MinimalSymbolDumper.cpp
View File

@ -24,15 +24,16 @@ using namespace llvm;
using namespace llvm::codeview; using namespace llvm::codeview;
using namespace llvm::pdb; using namespace llvm::pdb;
static StringRef getSymbolKindName(SymbolKind K) { static std::string getSymbolKindName(SymbolKind K) {
switch (K) { switch (K) {
#define SYMBOL_RECORD(EnumName, value, name) \ #define SYMBOL_RECORD(EnumName, value, name) \
case EnumName: \ case EnumName: \
return #EnumName; return #EnumName;
#define CV_SYMBOL(EnumName, value) SYMBOL_RECORD(EnumName, value, EnumName) #define CV_SYMBOL(EnumName, value) SYMBOL_RECORD(EnumName, value, EnumName)
#include "llvm/DebugInfo/CodeView/CodeViewSymbols.def" #include "llvm/DebugInfo/CodeView/CodeViewSymbols.def"
default: default: {
llvm_unreachable("Unknown symbol kind!"); return formatv("Unknown Symbol Kind [{0:X}]", uint32_t(K)).str();
}
} }
return ""; return "";
} }
@ -674,7 +675,7 @@ Error MinimalSymbolDumper::visitKnownRecord(CVSymbol &CVR, FrameProcSym &FP) {
Error MinimalSymbolDumper::visitKnownRecord(CVSymbol &CVR, Error MinimalSymbolDumper::visitKnownRecord(CVSymbol &CVR,
HeapAllocationSiteSym &HAS) { HeapAllocationSiteSym &HAS) {
AutoIndent Indent(P, 7); AutoIndent Indent(P, 7);
P.formatLine("type = {0}, addr = {1} call size = {2}", typeIndex(HAS.Type), P.formatLine("type = {0}, addr = {1} call size = {2}", idIndex(HAS.Type),
formatSegmentOffset(HAS.Segment, HAS.CodeOffset), formatSegmentOffset(HAS.Segment, HAS.CodeOffset),
HAS.CallInstructionSize); HAS.CallInstructionSize);
return Error::success(); return Error::success();
@ -686,7 +687,7 @@ Error MinimalSymbolDumper::visitKnownRecord(CVSymbol &CVR, InlineSiteSym &IS) {
StringRef Annotations(reinterpret_cast<const char *>(Bytes.begin()), StringRef Annotations(reinterpret_cast<const char *>(Bytes.begin()),
Bytes.size()); Bytes.size());
P.formatLine("inlinee = {0}, parent = {1}, end = {2}", typeIndex(IS.Inlinee), P.formatLine("inlinee = {0}, parent = {1}, end = {2}", idIndex(IS.Inlinee),
IS.Parent, IS.End); IS.Parent, IS.End);
P.formatLine("annotations = {0}", toHex(Annotations)); P.formatLine("annotations = {0}", toHex(Annotations));
return Error::success(); return Error::success();
@ -776,7 +777,7 @@ Error MinimalSymbolDumper::visitKnownRecord(CVSymbol &CVR,
Error MinimalSymbolDumper::visitKnownRecord(CVSymbol &CVR, CallerSym &Caller) { Error MinimalSymbolDumper::visitKnownRecord(CVSymbol &CVR, CallerSym &Caller) {
AutoIndent Indent(P, 7); AutoIndent Indent(P, 7);
for (const auto &I : Caller.Indices) { for (const auto &I : Caller.Indices) {
P.formatLine("callee: {0}", typeIndex(I)); P.formatLine("callee: {0}", idIndex(I));
} }
return Error::success(); return Error::success();
} }