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

llvm-pdbdump: Add flags controlling the type of values to dump. 

llvm-svn: 229330
This commit is contained in:
Zachary Turner 2015-02-15 20:27:53 +00:00
parent 583089c6c6
commit c0acf6837b
66 changed files with 392 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbol.h
View File

@ -53,7 +53,7 @@ public:
/// call dump() on the underlying RawSymbol, which allows us to discover
/// unknown properties, but individual implementations of PDBSymbol may
/// override the behavior to only dump known fields.
virtual void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const = 0;
virtual void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const = 0;
void defaultDump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const;
PDB_SymType getSymTag() const;

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolAnnotation.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Annotation)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getAddressOffset)
FORWARD_SYMBOL_METHOD(getAddressSection)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolBlock.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Block)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getAddressOffset)
FORWARD_SYMBOL_METHOD(getAddressSection)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompiland.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Compiland)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(isEditAndContinueEnabled)
FORWARD_SYMBOL_METHOD(getLexicalParentId)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::CompilandDetails)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
void getFrontEndVersion(VersionInfo &Version) const {
RawSymbol->getFrontEndVersion(Version);

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::CompilandEnv)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getLexicalParentId)
FORWARD_SYMBOL_METHOD(getName)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolCustom.h
View File

@ -28,7 +28,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Custom)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
void getDataBytes(llvm::SmallVector<uint8_t, 32> &bytes);
FORWARD_SYMBOL_METHOD(getSymIndexId)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolData.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Data)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getAccess)
FORWARD_SYMBOL_METHOD(getAddressOffset)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolExe.h
View File

@ -25,7 +25,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Exe)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getAge)
FORWARD_SYMBOL_METHOD(getGuid)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolFunc.h
View File

@ -22,7 +22,7 @@ public:
PDBSymbolFunc(const IPDBSession &PDBSession,
std::unique_ptr<IPDBRawSymbol> FuncSymbol);
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
std::unique_ptr<PDBSymbolTypeFunctionSig> getSignature() const;

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugEnd.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::FuncDebugEnd)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getAddressOffset)
FORWARD_SYMBOL_METHOD(getAddressSection)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugStart.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::FuncDebugStart)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getAddressOffset)
FORWARD_SYMBOL_METHOD(getAddressSection)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolLabel.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Label)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getAddressOffset)
FORWARD_SYMBOL_METHOD(getAddressSection)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolPublicSymbol.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::PublicSymbol)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getAddressOffset)
FORWARD_SYMBOL_METHOD(getAddressSection)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolThunk.h
View File

@ -25,7 +25,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Thunk)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getAccess)
FORWARD_SYMBOL_METHOD(getAddressOffset)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeArray.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::ArrayType)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getArrayIndexTypeId)
FORWARD_SYMBOL_METHOD(isConstType)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeBaseClass.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::BaseClass)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getAccess)
FORWARD_SYMBOL_METHOD(getClassParentId)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::BuiltinType)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getBuiltinType)
FORWARD_SYMBOL_METHOD(isConstType)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeCustom.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::CustomType)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getOemId)
FORWARD_SYMBOL_METHOD(getOemSymbolId)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeDimension.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Dimension)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getLowerBoundId)
FORWARD_SYMBOL_METHOD(getUpperBoundId)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Enum)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getBuiltinType)
FORWARD_SYMBOL_METHOD(getClassParentId)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeFriend.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Friend)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getClassParentId)
FORWARD_SYMBOL_METHOD(getName)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionArg.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::FunctionArg)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getClassParentId)
FORWARD_SYMBOL_METHOD(getLexicalParentId)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionSig.h
View File

@ -28,7 +28,7 @@ public:
std::unique_ptr<IPDBEnumSymbols> getArguments() const;
std::unique_ptr<PDBSymbol> getClassParent() const;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
void dumpArgList(raw_ostream &OS) const;
FORWARD_SYMBOL_METHOD(getCallingConvention)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeManaged.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::ManagedType)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getName)
FORWARD_SYMBOL_METHOD(getSymIndexId)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypePointer.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::PointerType)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(isConstType)
FORWARD_SYMBOL_METHOD(getLength)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeTypedef.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Typedef)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getBuiltinType)
FORWARD_SYMBOL_METHOD(getClassParentId)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::UDT)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getClassParentId)
FORWARD_SYMBOL_METHOD(hasConstructor)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTable.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::VTable)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getClassParentId)
FORWARD_SYMBOL_METHOD(isConstType)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTableShape.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::VTableShape)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(isConstType)
FORWARD_SYMBOL_METHOD(getCount)

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolUnknown.h
View File

@ -21,7 +21,7 @@ public:
PDBSymbolUnknown(const IPDBSession &PDBSession,
std::unique_ptr<IPDBRawSymbol> UnknownSymbol);
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
static bool classof(const PDBSymbol *S) {
return (S->getSymTag() == PDB_SymType::None ||

2
llvm/include/llvm/DebugInfo/PDB/PDBSymbolUsingNamespace.h
View File

@ -24,7 +24,7 @@ public:
DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::UsingNamespace)
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override;
void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level, PDB_DumpFlags Flags) const override;
FORWARD_SYMBOL_METHOD(getLexicalParentId)
FORWARD_SYMBOL_METHOD(getName)

38
llvm/include/llvm/DebugInfo/PDB/PDBTypes.h
View File

@ -75,6 +75,44 @@ enum class PDB_DumpLevel {
Detailed,
};
enum PDB_DumpFlags {
PDB_DF_None = 0x0,
PDB_DF_Functions = 0x1, // Dump functions
PDB_DF_Data = 0x2, // Dump variables and constants
PDB_DF_Labels = 0x4, // Dump labels
PDB_DF_PublicSyms = 0x8, // Dump public symbols
PDB_DF_Classes = 0x10, // Dump class types
PDB_DF_Enums = 0x20, // Dump enums
PDB_DF_Funcsigs = 0x40, // Dump function signatures
PDB_DF_VTables = 0x80, // Dump virtual function tables
PDB_DF_Thunks = 0x100, // Dump thunks
PDB_DF_ObjFiles = 0x200, // Dump object files (compilands)
PDB_DF_Typedefs = 0x400, // Dump typedefs
PDB_DF_Children = 0x800, // Dump children of the current symbol
PDB_DF_Hidden = 0x1000, // Dump everything. This is not simply a bitwise
// or of the previous flags. It will find symbols
// that would otherwise be missed, but can lead to
// much slower dumps for large input files.
PDB_DF_All = 0x7FF
};
inline PDB_DumpFlags operator|(PDB_DumpFlags LHS, PDB_DumpFlags RHS) {
return static_cast<PDB_DumpFlags>((int)LHS | (int)RHS);
}
inline PDB_DumpFlags operator&(PDB_DumpFlags LHS, PDB_DumpFlags RHS) {
return static_cast<PDB_DumpFlags>((int)LHS & (int)RHS);
}
inline PDB_DumpFlags operator~(PDB_DumpFlags LHS) {
return static_cast<PDB_DumpFlags>(~(int)LHS);
}
inline PDB_DumpFlags &operator|=(PDB_DumpFlags &LHS, PDB_DumpFlags RHS) {
return (LHS = (LHS | RHS));
}
inline PDB_DumpFlags &operator&=(PDB_DumpFlags &LHS, PDB_DumpFlags RHS) {
return (LHS = (LHS & RHS));
}
/// Defines a 128-bit unique identifier. This maps to a GUID on Windows, but
/// is abstracted here for the purposes of non-Windows platforms that don't have
/// the GUID structure defined.

4
llvm/lib/DebugInfo/PDB/DIA/DIARawSymbol.cpp
View File

@ -352,7 +352,7 @@ DIARawSymbol::findChildren(PDB_SymType Type) const {
enum SymTagEnum EnumVal = static_cast<enum SymTagEnum>(Type);
CComPtr<IDiaEnumSymbols> DiaEnumerator;
if (S_OK != Symbol->findChildren(EnumVal, nullptr, nsNone, &DiaEnumerator))
if (S_OK != Symbol->findChildrenEx(EnumVal, nullptr, nsNone, &DiaEnumerator))
return nullptr;
return llvm::make_unique<DIAEnumSymbols>(Session, DiaEnumerator);
@ -370,7 +370,7 @@ DIARawSymbol::findChildren(PDB_SymType Type, StringRef Name,
CComPtr<IDiaEnumSymbols> DiaEnumerator;
if (S_OK !=
Symbol->findChildren(EnumVal, Name16Str, CompareFlags, &DiaEnumerator))
Symbol->findChildrenEx(EnumVal, Name16Str, CompareFlags, &DiaEnumerator))
return nullptr;
return llvm::make_unique<DIAEnumSymbols>(Session, DiaEnumerator);

2
llvm/lib/DebugInfo/PDB/PDBSymbolAnnotation.cpp
View File

@ -20,4 +20,4 @@ PDBSymbolAnnotation::PDBSymbolAnnotation(const IPDBSession &PDBSession,
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolAnnotation::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

2
llvm/lib/DebugInfo/PDB/PDBSymbolBlock.cpp
View File

@ -20,4 +20,4 @@ PDBSymbolBlock::PDBSymbolBlock(const IPDBSession &PDBSession,
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolBlock::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

96
llvm/lib/DebugInfo/PDB/PDBSymbolCompiland.cpp
View File

@ -28,75 +28,43 @@ PDBSymbolCompiland::PDBSymbolCompiland(const IPDBSession &PDBSession,
std::unique_ptr<IPDBRawSymbol> Symbol)
: PDBSymbol(PDBSession, std::move(Symbol)) {}
#define SKIP_SYMBOL_IF_FLAG_UNSET(Tag, Flag) \
case PDB_SymType::Tag: \
if ((Flags & Flag) == 0) \
continue; \
break;
void PDBSymbolCompiland::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
if (Level == PDB_DumpLevel::Detailed) {
std::string FullName = getName();
StringRef Name = llvm::sys::path::filename(StringRef(FullName.c_str()));
OS.indent(Indent);
OS << "Compiland: " << Name << "\n";
std::string Source = getSourceFileName();
std::string Library = getLibraryName();
if (!Source.empty())
OS << stream_indent(Indent + 2) << "Source: " << this->getSourceFileName()
<< "\n";
if (!Library.empty())
OS << stream_indent(Indent + 2) << "Library: " << this->getLibraryName()
<< "\n";
TagStats Stats;
auto ChildrenEnum = getChildStats(Stats);
OS << stream_indent(Indent + 2) << "Children: " << Stats << "\n";
if (Level >= PDB_DumpLevel::Detailed) {
while (auto Child = ChildrenEnum->getNext()) {
if (llvm::isa<PDBSymbolCompilandDetails>(*Child))
continue;
if (llvm::isa<PDBSymbolCompilandEnv>(*Child))
continue;
PDB_DumpLevel ChildLevel = (Level == PDB_DumpLevel::Detailed)
? PDB_DumpLevel::Normal
: PDB_DumpLevel::Compact;
Child->dump(OS, Indent + 4, ChildLevel);
OS << "\n";
OS << stream_indent(Indent) << FullName;
if (Flags & PDB_DF_Children) {
if (Level >= PDB_DumpLevel::Detailed) {
auto ChildrenEnum = findAllChildren();
while (auto Child = ChildrenEnum->getNext()) {
switch (Child->getSymTag()) {
SKIP_SYMBOL_IF_FLAG_UNSET(Function, PDB_DF_Functions)
SKIP_SYMBOL_IF_FLAG_UNSET(Data, PDB_DF_Data)
SKIP_SYMBOL_IF_FLAG_UNSET(Label, PDB_DF_Labels)
SKIP_SYMBOL_IF_FLAG_UNSET(PublicSymbol, PDB_DF_PublicSyms)
SKIP_SYMBOL_IF_FLAG_UNSET(UDT, PDB_DF_Classes)
SKIP_SYMBOL_IF_FLAG_UNSET(Enum, PDB_DF_Enums)
SKIP_SYMBOL_IF_FLAG_UNSET(FunctionSig, PDB_DF_Funcsigs)
SKIP_SYMBOL_IF_FLAG_UNSET(VTable, PDB_DF_VTables)
SKIP_SYMBOL_IF_FLAG_UNSET(Thunk, PDB_DF_Thunks)
SKIP_SYMBOL_IF_FLAG_UNSET(Compiland, PDB_DF_ObjFiles)
default:
continue;
}
PDB_DumpLevel ChildLevel = (Level == PDB_DumpLevel::Detailed)
? PDB_DumpLevel::Normal
: PDB_DumpLevel::Compact;
OS << "\n";
Child->dump(OS, Indent + 2, ChildLevel, PDB_DF_Children);
}
}
}
auto DetailsEnum(findAllChildren<PDBSymbolCompilandDetails>());
if (auto CD = DetailsEnum->getNext()) {
VersionInfo FE;
VersionInfo BE;
CD->getFrontEndVersion(FE);
CD->getBackEndVersion(BE);
OS << stream_indent(Indent + 2) << "Compiler: " << CD->getCompilerName()
<< "\n";
OS << stream_indent(Indent + 2) << "Version: " << FE << ", " << BE
<< "\n";
OS << stream_indent(Indent + 2) << "Lang: " << CD->getLanguage() << "\n";
OS << stream_indent(Indent + 2) << "Attributes: ";
if (CD->hasDebugInfo())
OS << "DebugInfo ";
if (CD->isDataAligned())
OS << "DataAligned ";
if (CD->isLTCG())
OS << "LTCG ";
if (CD->hasSecurityChecks())
OS << "SecurityChecks ";
if (CD->isHotpatchable())
OS << "HotPatchable";
auto Files(Session.getSourceFilesForCompiland(*this));
OS << "\n";
OS << stream_indent(Indent + 2) << Files->getChildCount()
<< " source files";
}
uint32_t Count = DetailsEnum->getChildCount();
if (Count > 1) {
OS << "\n";
OS << stream_indent(Indent + 2) << "(" << Count - 1 << " more omitted)";
}
} else {
std::string FullName = getName();
OS << stream_indent(Indent) << "Compiland: " << FullName;

2
llvm/lib/DebugInfo/PDB/PDBSymbolCompilandDetails.cpp
View File

@ -20,4 +20,4 @@ PDBSymbolCompilandDetails::PDBSymbolCompilandDetails(
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolCompilandDetails::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

2
llvm/lib/DebugInfo/PDB/PDBSymbolCompilandEnv.cpp
View File

@ -26,4 +26,4 @@ std::string PDBSymbolCompilandEnv::getValue() const {
}
void PDBSymbolCompilandEnv::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

2
llvm/lib/DebugInfo/PDB/PDBSymbolCustom.cpp
View File

@ -25,4 +25,4 @@ void PDBSymbolCustom::getDataBytes(llvm::SmallVector<uint8_t, 32> &bytes) {
}
void PDBSymbolCustom::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

94
llvm/lib/DebugInfo/PDB/PDBSymbolData.cpp
View File

@ -24,58 +24,56 @@ PDBSymbolData::PDBSymbolData(const IPDBSession &PDBSession,
: PDBSymbol(PDBSession, std::move(DataSymbol)) {}
void PDBSymbolData::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS << stream_indent(Indent);
PDB_LocType Loc = getLocationType();
PDB_DataKind Kind = getDataKind();
if (Level >= PDB_DumpLevel::Normal) {
switch (Loc) {
case PDB_LocType::Static: {
uint32_t RVA = getRelativeVirtualAddress();
OS << Kind << " data[";
if (RVA != 0)
OS << format_hex(RVA, 10);
else
OS << "???";
break;
}
case PDB_LocType::TLS:
OS << "threadlocal " << Kind << " data[";
OS << getAddressSection() << ":" << format_hex(getAddressOffset(), 10);
break;
case PDB_LocType::RegRel:
OS << "regrel " << Kind << " data[";
OS << getRegisterId() << " + " << getOffset();
break;
case PDB_LocType::ThisRel: {
uint32_t Offset = getOffset();
OS << Kind << " data[this + " << format_hex(Offset, 4);
break;
}
case PDB_LocType::Enregistered:
OS << "register " << Kind << " data[" << getRegisterId();
break;
case PDB_LocType::BitField: {
OS << "bitfield data[this + ";
uint32_t Offset = getOffset();
uint32_t BitPos = getBitPosition();
uint32_t Length = getLength();
OS << format_hex(Offset, 4) << ":" << BitPos << "," << Length;
break;
}
case PDB_LocType::Slot:
OS << getSlot();
break;
case PDB_LocType::Constant: {
OS << "constant data[";
OS << getValue();
break;
}
case PDB_LocType::IlRel:
case PDB_LocType::MetaData:
default:
switch (Loc) {
case PDB_LocType::Static: {
uint32_t RVA = getRelativeVirtualAddress();
OS << Kind << " data[";
if (RVA != 0)
OS << format_hex(RVA, 10);
else
OS << "???";
}
break;
}
case PDB_LocType::TLS:
OS << "threadlocal " << Kind << " data[";
OS << getAddressSection() << ":" << format_hex(getAddressOffset(), 10);
break;
case PDB_LocType::RegRel:
OS << "regrel " << Kind << " data[";
OS << getRegisterId() << " + " << getOffset();
break;
case PDB_LocType::ThisRel: {
uint32_t Offset = getOffset();
OS << Kind << " data[this + " << format_hex(Offset, 4);
break;
}
case PDB_LocType::Enregistered:
OS << "register " << Kind << " data[" << getRegisterId();
break;
case PDB_LocType::BitField: {
OS << "bitfield data[this + ";
uint32_t Offset = getOffset();
uint32_t BitPos = getBitPosition();
uint32_t Length = getLength();
OS << format_hex(Offset, 4) << ":" << BitPos << "," << Length;
break;
}
case PDB_LocType::Slot:
OS << getSlot();
break;
case PDB_LocType::Constant: {
OS << "constant data[";
OS << getValue();
break;
}
case PDB_LocType::IlRel:
case PDB_LocType::MetaData:
default:
OS << "???";
}
OS << "] ";

99
llvm/lib/DebugInfo/PDB/PDBSymbolExe.cpp
View File

@ -21,12 +21,18 @@
using namespace llvm;
#define SKIP_SYMBOL_IF_FLAG_UNSET(Tag, Flag) \
case PDB_SymType::Tag: \
if ((Flags & Flag) == 0) \
continue; \
break;
PDBSymbolExe::PDBSymbolExe(const IPDBSession &PDBSession,
std::unique_ptr<IPDBRawSymbol> Symbol)
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolExe::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
std::string FileName(getSymbolsFileName());
OS << stream_indent(Indent) << "Summary for " << FileName << "\n";
@ -46,25 +52,76 @@ void PDBSymbolExe::dump(raw_ostream &OS, int Indent,
OS << "HasPrivateSymbols ";
OS << "\n";
auto ChildrenEnum = findAllChildren();
OS << stream_indent(Indent + 2) << ChildrenEnum->getChildCount()
<< " children\n";
#if 0
dumpChildren(OS, PDB_SymType::None, Indent+4);
#else
dumpChildren(OS, "Compilands", PDB_SymType::Compiland, Indent + 4);
dumpChildren(OS, "Functions", PDB_SymType::Function, Indent + 4);
dumpChildren(OS, "Blocks", PDB_SymType::Block, Indent + 4);
dumpChildren(OS, "Data", PDB_SymType::Data, Indent + 4);
dumpChildren(OS, "Labels", PDB_SymType::Label, Indent + 4);
dumpChildren(OS, "Public Symbols", PDB_SymType::PublicSymbol, Indent + 4);
dumpChildren(OS, "UDTs", PDB_SymType::UDT, Indent + 4);
dumpChildren(OS, "Enums", PDB_SymType::Enum, Indent + 4);
dumpChildren(OS, "Function Signatures", PDB_SymType::FunctionSig, Indent + 4);
dumpChildren(OS, "Typedefs", PDB_SymType::Typedef, Indent + 4);
dumpChildren(OS, "VTables", PDB_SymType::VTable, Indent + 4);
dumpChildren(OS, "Thunks", PDB_SymType::Thunk, Indent + 4);
#endif
if (Flags & PDB_DF_Children) {
if (Flags & PDB_DF_Hidden) {
// For some reason, for each SymTag T, this dumps more items of type T
// than are dumped by calling dumpChildren(T). In other words, there are
// "hidden" symbols. For example, it causes functions to be dumped which
// have no address information, whereas specifically dumping only
// functions will not find those symbols.
//
// My suspicion is that in the underlying DIA call, when you call
// findChildren, passing a value of SymTagNone means all children
// recursively, whereas passing a concrete tag value means only immediate
// children of the global scope. So perhaps we need to find these
// mysterious missing values by recursing through the hierarchy.
//
// On the other hand, there may just be some symbols that DIA tries to
// hide from you because it thinks you don't care about them. However
// experimentation shows that even vtables, for example, can't be found
// without an exhaustive search.
auto ChildrenEnum = findAllChildren();
OS << stream_indent(Indent + 2) << ChildrenEnum->getChildCount()
<< " symbols";
while (auto Child = ChildrenEnum->getNext()) {
switch (Child->getSymTag()) {
SKIP_SYMBOL_IF_FLAG_UNSET(Function, PDB_DF_Functions)
SKIP_SYMBOL_IF_FLAG_UNSET(Data, PDB_DF_Data)
SKIP_SYMBOL_IF_FLAG_UNSET(Label, PDB_DF_Labels)
SKIP_SYMBOL_IF_FLAG_UNSET(PublicSymbol, PDB_DF_PublicSyms)
SKIP_SYMBOL_IF_FLAG_UNSET(UDT, PDB_DF_Classes)
SKIP_SYMBOL_IF_FLAG_UNSET(Enum, PDB_DF_Enums)
SKIP_SYMBOL_IF_FLAG_UNSET(FunctionSig, PDB_DF_Funcsigs)
SKIP_SYMBOL_IF_FLAG_UNSET(VTable, PDB_DF_VTables)
SKIP_SYMBOL_IF_FLAG_UNSET(Thunk, PDB_DF_Thunks)
SKIP_SYMBOL_IF_FLAG_UNSET(Compiland, PDB_DF_ObjFiles)
default:
continue;
}
PDB_DumpLevel ChildLevel = (Level == PDB_DumpLevel::Detailed)
? PDB_DumpLevel::Normal
: PDB_DumpLevel::Compact;
OS << "\n";
Child->dump(OS, Indent + 4, ChildLevel, PDB_DF_Children);
}
} else {
if (Flags & PDB_DF_ObjFiles)
dumpChildren(OS, "Compilands", PDB_SymType::Compiland, Indent + 4);
if (Flags & PDB_DF_Functions)
dumpChildren(OS, "Functions", PDB_SymType::Function, Indent + 4);
if (Flags & PDB_DF_Data)
dumpChildren(OS, "Data", PDB_SymType::Data, Indent + 4);
if (Flags & PDB_DF_Labels)
dumpChildren(OS, "Labels", PDB_SymType::Label, Indent + 4);
if (Flags & PDB_DF_PublicSyms)
dumpChildren(OS, "Public Symbols", PDB_SymType::PublicSymbol,
Indent + 4);
if (Flags & PDB_DF_Classes)
dumpChildren(OS, "UDTs", PDB_SymType::UDT, Indent + 4);
if (Flags & PDB_DF_Enums)
dumpChildren(OS, "Enums", PDB_SymType::Enum, Indent + 4);
if (Flags & PDB_DF_Funcsigs)
dumpChildren(OS, "Function Signatures", PDB_SymType::FunctionSig,
Indent + 4);
if (Flags & PDB_DF_Typedefs)
dumpChildren(OS, "Typedefs", PDB_SymType::Typedef, Indent + 4);
if (Flags & PDB_DF_VTables)
dumpChildren(OS, "VTables", PDB_SymType::VTable, Indent + 4);
if (Flags & PDB_DF_Thunks)
dumpChildren(OS, "Thunks", PDB_SymType::Thunk, Indent + 4);
}
}
}
void PDBSymbolExe::dumpChildren(raw_ostream &OS, StringRef Label,
@ -73,7 +130,7 @@ void PDBSymbolExe::dumpChildren(raw_ostream &OS, StringRef Label,
OS << stream_indent(Indent) << Label << ": (" << ChildrenEnum->getChildCount()
<< " items)\n";
while (auto Child = ChildrenEnum->getNext()) {
Child->dump(OS, Indent + 2, PDB_DumpLevel::Normal);
Child->dump(OS, Indent + 2, PDB_DumpLevel::Normal, PDB_DF_None);
OS << "\n";
}
}

108
llvm/lib/DebugInfo/PDB/PDBSymbolFunc.cpp
View File

@ -29,66 +29,58 @@ std::unique_ptr<PDBSymbolTypeFunctionSig> PDBSymbolFunc::getSignature() const {
}
void PDBSymbolFunc::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
uint32_t FuncStart = getRelativeVirtualAddress();
uint32_t FuncEnd = FuncStart + getLength();
OS << stream_indent(Indent);
// if (getName() == "__crtCreateThreadpoolWait") {
// RawSymbol->dump(OS, Indent+2, Level);
// OS.flush();
//}
if (Level >= PDB_DumpLevel::Normal) {
uint32_t FuncStart = getRelativeVirtualAddress();
uint32_t FuncEnd = FuncStart + getLength();
if (FuncStart == 0 && FuncEnd == 0) {
OS << "func [???] ";
} else {
OS << "func ";
OS << "[" << format_hex(FuncStart, 8);
if (auto DebugStart = findOneChild<PDBSymbolFuncDebugStart>())
OS << "+" << DebugStart->getRelativeVirtualAddress() - FuncStart;
OS << " - " << format_hex(FuncEnd, 8);
if (auto DebugEnd = findOneChild<PDBSymbolFuncDebugEnd>())
OS << "-" << FuncEnd - DebugEnd->getRelativeVirtualAddress();
OS << "] ";
}
PDB_RegisterId Reg = getLocalBasePointerRegisterId();
if (Reg == PDB_RegisterId::VFrame)
OS << "(VFrame)";
else if (hasFramePointer())
OS << "(" << Reg << ")";
else
OS << "(FPO)";
OS << " ";
if (auto FuncSig = getSignature()) {
// If we have a signature, dump the name with the signature.
if (auto ReturnType = FuncSig->getReturnType()) {
ReturnType->dump(OS, 0, PDB_DumpLevel::Compact);
OS << " ";
}
OS << FuncSig->getCallingConvention() << " ";
if (auto ClassParent = FuncSig->getClassParent()) {
ClassParent->dump(OS, 0, PDB_DumpLevel::Compact);
OS << "::";
}
OS << getName();
FuncSig->dumpArgList(OS);
} else {
uint32_t ClassId = getClassParentId();
if (ClassId != 0) {
if (auto Class = Session.getSymbolById(ClassId)) {
if (auto UDT = dyn_cast<PDBSymbolTypeUDT>(Class.get()))
OS << UDT->getName() << "::";
else
OS << "{class " << Class->getSymTag() << "}::";
}
}
OS << getName();
}
if (FuncStart == 0 && FuncEnd == 0) {
OS << "func [???] ";
} else {
OS << "func ";
OS << "[" << format_hex(FuncStart, 8);
if (auto DebugStart = findOneChild<PDBSymbolFuncDebugStart>())
OS << "+" << DebugStart->getRelativeVirtualAddress() - FuncStart;
OS << " - " << format_hex(FuncEnd, 8);
if (auto DebugEnd = findOneChild<PDBSymbolFuncDebugEnd>())
OS << "-" << FuncEnd - DebugEnd->getRelativeVirtualAddress();
OS << "] ";
}
PDB_RegisterId Reg = getLocalBasePointerRegisterId();
if (Reg == PDB_RegisterId::VFrame)
OS << "(VFrame)";
else if (hasFramePointer())
OS << "(" << Reg << ")";
else
OS << "(FPO)";
OS << " ";
if (isVirtual() || isPureVirtual())
OS << "virtual ";
if (auto FuncSig = getSignature()) {
// If we have a signature, dump the name with the signature.
if (auto ReturnType = FuncSig->getReturnType()) {
ReturnType->dump(OS, 0, PDB_DumpLevel::Compact, PDB_DF_Children);
OS << " ";
}
OS << FuncSig->getCallingConvention() << " ";
OS << getName();
FuncSig->dumpArgList(OS);
if (isPureVirtual())
OS << " = 0";
} else {
uint32_t ClassId = getClassParentId();
if (ClassId != 0) {
if (auto Class = Session.getSymbolById(ClassId)) {
if (auto UDT = dyn_cast<PDBSymbolTypeUDT>(Class.get()))
OS << UDT->getName() << "::";
else
OS << "{class " << Class->getSymTag() << "}::";
}
}
OS << getName();
}
}

2
llvm/lib/DebugInfo/PDB/PDBSymbolFuncDebugEnd.cpp
View File

@ -20,4 +20,4 @@ PDBSymbolFuncDebugEnd::PDBSymbolFuncDebugEnd(
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolFuncDebugEnd::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

2
llvm/lib/DebugInfo/PDB/PDBSymbolFuncDebugStart.cpp
View File

@ -20,4 +20,4 @@ PDBSymbolFuncDebugStart::PDBSymbolFuncDebugStart(
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolFuncDebugStart::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

2
llvm/lib/DebugInfo/PDB/PDBSymbolLabel.cpp
View File

@ -21,7 +21,7 @@ PDBSymbolLabel::PDBSymbolLabel(const IPDBSession &PDBSession,
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolLabel::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS << stream_indent(Indent);
OS << "label [" << format_hex(getRelativeVirtualAddress(), 10) << "] "
<< getName();

2
llvm/lib/DebugInfo/PDB/PDBSymbolPublicSymbol.cpp
View File

@ -20,7 +20,7 @@ PDBSymbolPublicSymbol::PDBSymbolPublicSymbol(
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolPublicSymbol::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS << stream_indent(Indent);
OS << "public symbol: " << getName();
}

2
llvm/lib/DebugInfo/PDB/PDBSymbolThunk.cpp
View File

@ -21,7 +21,7 @@ PDBSymbolThunk::PDBSymbolThunk(const IPDBSession &PDBSession,
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolThunk::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS.indent(Indent);
OS << "thunk ";
PDB_ThunkOrdinal Ordinal = getThunkOrdinal();

4
llvm/lib/DebugInfo/PDB/PDBSymbolTypeArray.cpp
View File

@ -21,10 +21,10 @@ PDBSymbolTypeArray::PDBSymbolTypeArray(const IPDBSession &PDBSession,
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypeArray::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS << stream_indent(Indent);
if (auto ElementType = Session.getSymbolById(getTypeId()))
ElementType->dump(OS, 0, PDB_DumpLevel::Compact);
ElementType->dump(OS, 0, PDB_DumpLevel::Compact, PDB_DF_Children);
else
OS << "<unknown-element-type>";
OS << "[" << getLength() << "]";

2
llvm/lib/DebugInfo/PDB/PDBSymbolTypeBaseClass.cpp
View File

@ -20,7 +20,7 @@ PDBSymbolTypeBaseClass::PDBSymbolTypeBaseClass(
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypeBaseClass::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS << stream_indent(Indent);
OS << "<base class> " << getName();
}

2
llvm/lib/DebugInfo/PDB/PDBSymbolTypeBuiltin.cpp
View File

@ -20,7 +20,7 @@ PDBSymbolTypeBuiltin::PDBSymbolTypeBuiltin(
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypeBuiltin::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS << stream_indent(Indent);
PDB_BuiltinType Type = getBuiltinType();
OS << Type;

2
llvm/lib/DebugInfo/PDB/PDBSymbolTypeCustom.cpp
View File

@ -20,4 +20,4 @@ PDBSymbolTypeCustom::PDBSymbolTypeCustom(const IPDBSession &PDBSession,
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypeCustom::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

2
llvm/lib/DebugInfo/PDB/PDBSymbolTypeDimension.cpp
View File

@ -21,4 +21,4 @@ PDBSymbolTypeDimension::PDBSymbolTypeDimension(
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypeDimension::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

4
llvm/lib/DebugInfo/PDB/PDBSymbolTypeEnum.cpp
View File

@ -21,7 +21,7 @@ PDBSymbolTypeEnum::PDBSymbolTypeEnum(const IPDBSession &PDBSession,
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypeEnum::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS << stream_indent(Indent);
if (Level >= PDB_DumpLevel::Normal)
OS << "enum ";
@ -29,7 +29,7 @@ void PDBSymbolTypeEnum::dump(raw_ostream &OS, int Indent,
uint32_t ClassId = getClassParentId();
if (ClassId != 0) {
if (auto ClassParent = Session.getSymbolById(ClassId)) {
ClassParent->dump(OS, 0, Level);
ClassParent->dump(OS, 0, Level, PDB_DF_Children);
OS << "::";
}
}

2
llvm/lib/DebugInfo/PDB/PDBSymbolTypeFriend.cpp
View File

@ -20,4 +20,4 @@ PDBSymbolTypeFriend::PDBSymbolTypeFriend(const IPDBSession &PDBSession,
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypeFriend::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

4
llvm/lib/DebugInfo/PDB/PDBSymbolTypeFunctionArg.cpp
View File

@ -21,10 +21,10 @@ PDBSymbolTypeFunctionArg::PDBSymbolTypeFunctionArg(
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypeFunctionArg::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS << stream_indent(Indent);
uint32_t TypeId = getTypeId();
if (auto Type = Session.getSymbolById(TypeId)) {
Type->dump(OS, 0, Level);
Type->dump(OS, 0, Level, PDB_DF_Children);
}
}

8
llvm/lib/DebugInfo/PDB/PDBSymbolTypeFunctionSig.cpp
View File

@ -87,7 +87,7 @@ void PDBSymbolTypeFunctionSig::dumpArgList(raw_ostream &OS) const {
if (auto ChildEnum = getArguments()) {
uint32_t Index = 0;
while (auto Arg = ChildEnum->getNext()) {
Arg->dump(OS, 0, PDB_DumpLevel::Compact);
Arg->dump(OS, 0, PDB_DumpLevel::Compact, PDB_DF_Children);
if (++Index < ChildEnum->getChildCount())
OS << ", ";
}
@ -100,18 +100,18 @@ void PDBSymbolTypeFunctionSig::dumpArgList(raw_ostream &OS) const {
}
void PDBSymbolTypeFunctionSig::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS << stream_indent(Indent);
if (auto ReturnType = getReturnType()) {
ReturnType->dump(OS, 0, PDB_DumpLevel::Compact);
ReturnType->dump(OS, 0, PDB_DumpLevel::Compact, PDB_DF_Children);
OS << " ";
}
OS << getCallingConvention() << " ";
if (auto ClassParent = getClassParent()) {
OS << "(";
ClassParent->dump(OS, 0, PDB_DumpLevel::Compact);
ClassParent->dump(OS, 0, PDB_DumpLevel::Compact, PDB_DF_Children);
OS << "::*)";
}

2
llvm/lib/DebugInfo/PDB/PDBSymbolTypeManaged.cpp
View File

@ -20,4 +20,4 @@ PDBSymbolTypeManaged::PDBSymbolTypeManaged(
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypeManaged::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

6
llvm/lib/DebugInfo/PDB/PDBSymbolTypePointer.cpp
View File

@ -22,7 +22,7 @@ PDBSymbolTypePointer::PDBSymbolTypePointer(
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypePointer::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS << stream_indent(Indent);
if (isConstType())
OS << "const ";
@ -34,12 +34,12 @@ void PDBSymbolTypePointer::dump(raw_ostream &OS, int Indent,
// the middle of the signature.
if (auto FuncSig = dyn_cast<PDBSymbolTypeFunctionSig>(PointeeType.get())) {
if (auto ReturnType = FuncSig->getReturnType())
ReturnType->dump(OS, 0, PDB_DumpLevel::Compact);
ReturnType->dump(OS, 0, PDB_DumpLevel::Compact, PDB_DF_Children);
OS << " (" << FuncSig->getCallingConvention() << " ";
OS << ((isReference()) ? "&" : "*") << ")";
FuncSig->dumpArgList(OS);
} else {
PointeeType->dump(OS, 0, PDB_DumpLevel::Compact);
PointeeType->dump(OS, 0, PDB_DumpLevel::Compact, PDB_DF_Children);
OS << ((isReference()) ? "&" : "*");
}
}

4
llvm/lib/DebugInfo/PDB/PDBSymbolTypeTypedef.cpp
View File

@ -22,7 +22,7 @@ PDBSymbolTypeTypedef::PDBSymbolTypeTypedef(
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypeTypedef::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS.indent(Indent);
if (Level >= PDB_DumpLevel::Normal) {
std::string Name = getName();
@ -30,7 +30,7 @@ void PDBSymbolTypeTypedef::dump(raw_ostream &OS, int Indent,
std::string TargetTypeName;
uint32_t TargetId = getTypeId();
if (auto TypeSymbol = Session.getSymbolById(TargetId)) {
TypeSymbol->dump(OS, 0, PDB_DumpLevel::Compact);
TypeSymbol->dump(OS, 0, PDB_DumpLevel::Compact, PDB_DF_Children);
}
OS << TargetTypeName;
} else {

4
llvm/lib/DebugInfo/PDB/PDBSymbolTypeUDT.cpp
View File

@ -21,7 +21,7 @@ PDBSymbolTypeUDT::PDBSymbolTypeUDT(const IPDBSession &PDBSession,
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypeUDT::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS << stream_indent(Indent);
if (Level >= PDB_DumpLevel::Normal)
OS << "class ";
@ -30,7 +30,7 @@ void PDBSymbolTypeUDT::dump(raw_ostream &OS, int Indent,
uint32_t ClassId = getClassParentId();
if (ClassId != 0) {
if (auto ClassParent = Session.getSymbolById(ClassId)) {
ClassParent->dump(OS, 0, Level);
ClassParent->dump(OS, 0, Level, PDB_DF_Children);
OS << "::";
}
}

5
llvm/lib/DebugInfo/PDB/PDBSymbolTypeVTable.cpp
View File

@ -23,11 +23,11 @@ PDBSymbolTypeVTable::PDBSymbolTypeVTable(const IPDBSession &PDBSession,
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypeVTable::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {
OS << stream_indent(Indent);
uint32_t ClassId = getClassParentId();
if (auto ClassParent = Session.getSymbolById(ClassId)) {
ClassParent->dump(OS, 0, PDB_DumpLevel::Compact);
ClassParent->dump(OS, 0, PDB_DumpLevel::Compact, PDB_DF_Children);
OS << "::";
}
OS << "<vtbl> ";
@ -38,5 +38,4 @@ void PDBSymbolTypeVTable::dump(raw_ostream &OS, int Indent,
VtblPointer->getTypeId()))
OS << "(" << VtblShape->getCount() << " entries)";
}
OS.flush();
}

2
llvm/lib/DebugInfo/PDB/PDBSymbolTypeVTableShape.cpp
View File

@ -20,4 +20,4 @@ PDBSymbolTypeVTableShape::PDBSymbolTypeVTableShape(
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolTypeVTableShape::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

2
llvm/lib/DebugInfo/PDB/PDBSymbolUnknown.cpp
View File

@ -20,4 +20,4 @@ PDBSymbolUnknown::PDBSymbolUnknown(const IPDBSession &PDBSession,
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolUnknown::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

2
llvm/lib/DebugInfo/PDB/PDBSymbolUsingNamespace.cpp
View File

@ -20,4 +20,4 @@ PDBSymbolUsingNamespace::PDBSymbolUsingNamespace(
: PDBSymbol(PDBSession, std::move(Symbol)) {}
void PDBSymbolUsingNamespace::dump(raw_ostream &OS, int Indent,
PDB_DumpLevel Level) const {}
PDB_DumpLevel Level, PDB_DumpFlags Flags) const {}

85
llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp
View File

@ -38,15 +38,78 @@
using namespace llvm;
namespace opts {
enum class PDB_DumpType { ByType, ByObjFile, Both };
cl::list<std::string> InputFilenames(cl::Positional,
cl::desc("<input PDB files>"),
cl::OneOrMore);
cl::opt<bool> Compilands("compilands",
cl::desc("Display a list of compilands (e.g. object "
"files) and symbols for each one."));
cl::alias CompilandsShort("c", cl::desc("Alias for --compilands"),
cl::aliasopt(Compilands));
cl::opt<bool> DumpHidden(
"hidden",
cl::desc("Attempt to find hidden symbols. This can find additional\n"
"symbols that cannot be found otherwise. For example, vtables\n"
"can only be found with an exhaustive search such as this. Be\n"
"warned that the performance can be prohibitive on large PDB "
"files."));
cl::opt<bool> DumpAll(
"all",
cl::desc("Specifies all other options except -hidden and -group-by"));
cl::opt<bool> DumpObjFiles("compilands", cl::desc("Display object files"));
cl::opt<bool> DumpFuncs("functions", cl::desc("Display function information"));
cl::opt<bool> DumpData(
"data",
cl::desc("Display global, class, and constant variable information."));
cl::opt<bool> DumpLabels("labels", cl::desc("Display labels"));
cl::opt<bool> DumpPublic("public", cl::desc("Display public symbols"));
cl::opt<bool> DumpClasses("classes", cl::desc("Display class type information"));
cl::opt<bool> DumpEnums("enums", cl::desc("Display enum information"));
cl::opt<bool> DumpFuncsigs("funcsigs",
cl::desc("Display unique function signatures"));
cl::opt<bool> DumpTypedefs("typedefs", cl::desc("Display typedefs"));
cl::opt<bool> DumpThunks("thunks", cl::desc("Display thunks"));
cl::opt<bool> DumpVtables(
"vtables",
cl::desc("Display virtual function tables (only with --exhaustive)"));
static cl::opt<PDB_DumpType> DumpMode(
"group-by", cl::init(PDB_DumpType::ByType), cl::desc("Dump mode:"),
cl::values(
clEnumValN(PDB_DumpType::ByType, "type",
"(Default) Display symbols grouped by type"),
clEnumValN(PDB_DumpType::ByObjFile, "compiland",
"Display symbols grouped under their containing object "
"file."),
clEnumValN(
PDB_DumpType::Both, "both",
"Display symbols grouped by type, and then by object file.")));
}
#define SET_DUMP_FLAG_FROM_OPT(Var, Flag, Opt) \
if (opts::Opt) \
Var |= Flag;
PDB_DumpFlags CalculateDumpFlags() {
PDB_DumpFlags Flags = PDB_DF_None;
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Hidden, DumpHidden)
if (opts::DumpAll)
return Flags | PDB_DF_All;
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_ObjFiles, DumpObjFiles)
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Functions, DumpFuncs)
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Data, DumpData)
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Labels, DumpLabels)
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_PublicSyms, DumpPublic)
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Classes, DumpClasses)
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Enums, DumpEnums)
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Funcsigs, DumpFuncsigs)
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Typedefs, DumpTypedefs)
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Thunks, DumpThunks)
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_VTables, DumpVtables)
return Flags;
}
static void dumpInput(StringRef Path) {
@ -57,15 +120,19 @@ static void dumpInput(StringRef Path) {
outs() << " is available for your platform.";
return;
}
PDB_DumpFlags Flags = CalculateDumpFlags();
if (opts::DumpMode != opts::PDB_DumpType::ByObjFile)
Flags |= PDB_DF_Children;
auto GlobalScope(Session->getGlobalScope());
GlobalScope->dump(outs(), 0, PDB_DumpLevel::Normal);
outs().flush();
GlobalScope->dump(outs(), 0, PDB_DumpLevel::Normal, Flags);
outs() << "\n";
if (opts::Compilands) {
if (opts::DumpMode != opts::PDB_DumpType::ByType) {
auto Compilands = GlobalScope->findAllChildren<PDBSymbolCompiland>();
while (auto Compiland = Compilands->getNext()) {
Compiland->dump(outs(), 0, PDB_DumpLevel::Detailed);
Compiland->dump(outs(), 0, PDB_DumpLevel::Detailed,
Flags | PDB_DF_Children);
outs() << "\n";
}
}