From 13a819cbad001f9b24431a7f93d518ef5411199f Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Thu, 12 Feb 2015 21:09:24 +0000 Subject: [PATCH] Add concrete type overloads to PDBSymbol::findChildren(). Frequently you only want to iterate over children of a specific type (e.g. functions). Previously you would get back a generic interface that allowed iteration over the base symbol type, which you would have to dyn_cast<> each one of. With this patch, we allow the user to specify the concrete type as a template parameter, and it will return an iterator which returns instances of the concrete type directly. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@228960 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../DebugInfo/PDB/ConcreteSymbolEnumerator.h | 58 +++++++++++++++++++ include/llvm/DebugInfo/PDB/PDBSymbol.h | 18 +++++- .../llvm/DebugInfo/PDB/PDBSymbolAnnotation.h | 6 +- include/llvm/DebugInfo/PDB/PDBSymbolBlock.h | 6 +- .../llvm/DebugInfo/PDB/PDBSymbolCompiland.h | 6 +- .../DebugInfo/PDB/PDBSymbolCompilandDetails.h | 6 +- .../DebugInfo/PDB/PDBSymbolCompilandEnv.h | 6 +- include/llvm/DebugInfo/PDB/PDBSymbolCustom.h | 6 +- include/llvm/DebugInfo/PDB/PDBSymbolData.h | 6 +- include/llvm/DebugInfo/PDB/PDBSymbolExe.h | 6 +- include/llvm/DebugInfo/PDB/PDBSymbolFunc.h | 6 +- .../DebugInfo/PDB/PDBSymbolFuncDebugEnd.h | 6 +- .../DebugInfo/PDB/PDBSymbolFuncDebugStart.h | 6 +- include/llvm/DebugInfo/PDB/PDBSymbolLabel.h | 6 +- .../DebugInfo/PDB/PDBSymbolPublicSymbol.h | 6 +- include/llvm/DebugInfo/PDB/PDBSymbolThunk.h | 6 +- .../llvm/DebugInfo/PDB/PDBSymbolTypeArray.h | 6 +- .../DebugInfo/PDB/PDBSymbolTypeBaseClass.h | 6 +- .../llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h | 6 +- .../llvm/DebugInfo/PDB/PDBSymbolTypeCustom.h | 6 +- .../DebugInfo/PDB/PDBSymbolTypeDimension.h | 6 +- .../llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h | 6 +- .../llvm/DebugInfo/PDB/PDBSymbolTypeFriend.h | 6 +- .../DebugInfo/PDB/PDBSymbolTypeFunctionArg.h | 6 +- .../DebugInfo/PDB/PDBSymbolTypeFunctionSig.h | 6 +- .../llvm/DebugInfo/PDB/PDBSymbolTypeManaged.h | 6 +- .../llvm/DebugInfo/PDB/PDBSymbolTypePointer.h | 6 +- .../llvm/DebugInfo/PDB/PDBSymbolTypeTypedef.h | 6 +- include/llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h | 6 +- .../llvm/DebugInfo/PDB/PDBSymbolTypeVTable.h | 6 +- .../DebugInfo/PDB/PDBSymbolTypeVTableShape.h | 6 +- .../DebugInfo/PDB/PDBSymbolUsingNamespace.h | 6 +- lib/DebugInfo/PDB/PDBExtras.cpp | 2 +- lib/DebugInfo/PDB/PDBSymbol.cpp | 6 +- lib/DebugInfo/PDB/PDBSymbolCompiland.cpp | 16 ++--- lib/DebugInfo/PDB/PDBSymbolData.cpp | 2 + lib/DebugInfo/PDB/PDBSymbolFunc.cpp | 26 ++------- lib/DebugInfo/PDB/PDBSymbolThunk.cpp | 12 +++- tools/llvm-pdbdump/llvm-pdbdump.cpp | 8 +-- 39 files changed, 167 insertions(+), 161 deletions(-) create mode 100644 include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h diff --git a/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h b/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h new file mode 100644 index 00000000000..6039709b597 --- /dev/null +++ b/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h @@ -0,0 +1,58 @@ +//===- ConcreteSymbolEnumerator.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_CONCRETESYMBOLENUMERATOR_H +#define LLVM_DEBUGINFO_PDB_CONCRETESYMBOLENUMERATOR_H + +#include +#include "IPDBEnumChildren.h" + +namespace llvm { + +template +class ConcreteSymbolEnumerator : public IPDBEnumChildren { +public: + ConcreteSymbolEnumerator(std::unique_ptr SymbolEnumerator) + : Enumerator(std::move(SymbolEnumerator)) {} + + virtual ~ConcreteSymbolEnumerator() {} + + uint32_t getChildCount() const override { + return Enumerator->getChildCount(); + } + + std::unique_ptr getChildAtIndex(uint32_t Index) const { + std::unique_ptr Child = Enumerator->getChildAtIndex(Index); + return make_concrete_child(std::move(Child)); + } + + std::unique_ptr getNext() { + std::unique_ptr Child = Enumerator->getNext(); + return make_concrete_child(std::move(Child)); + } + + void reset() { Enumerator->reset(); } + + MyType *clone() const { + std::unique_ptr WrappedClone(Enumerator->clone()); + return new ConcreteSymbolEnumerator(std::move(WrappedClone)); + } + +private: + std::unique_ptr + make_concrete_child(std::unique_ptr Child) const { + ChildType *ConcreteChild = dyn_cast_or_null(Child.release()); + return std::unique_ptr(ConcreteChild); + } + + std::unique_ptr Enumerator; +}; +} + +#endif diff --git a/include/llvm/DebugInfo/PDB/PDBSymbol.h b/include/llvm/DebugInfo/PDB/PDBSymbol.h index 95bc7fd44ec..9aa2da0b1f8 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbol.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbol.h @@ -16,6 +16,7 @@ #include "llvm/ADT/StringRef.h" #include "llvm/Support/Casting.h" +#include "ConcreteSymbolEnumerator.h" #include "IPDBRawSymbol.h" #include "PDBExtras.h" #include "PDBTypes.h" @@ -30,6 +31,10 @@ namespace llvm { class IPDBRawSymbol; class raw_ostream; +#define DECLARE_PDB_SYMBOL_CONCRETE_TYPE(TagValue) \ + static const PDB_SymType Tag = TagValue; \ + static bool classof(const PDBSymbol *S) { return S->getSymTag() == Tag; } + /// PDBSymbol defines the base of the inheritance hierarchy for concrete symbol /// types (e.g. functions, executables, vtables, etc). All concrete symbol /// types inherit from PDBSymbol and expose the exact set of methods that are @@ -55,7 +60,18 @@ public: PDB_SymType getSymTag() const; - std::unique_ptr findChildren(PDB_SymType Type) const; + template std::unique_ptr findOneChild() const { + auto Enumerator(findAllChildren()); + return Enumerator->getNext(); + } + + template + std::unique_ptr> findAllChildren() const { + auto BaseIter = RawSymbol->findChildren(T::Tag); + return std::make_unique>(std::move(BaseIter)); + } + + std::unique_ptr findAllChildren() const; std::unique_ptr findChildren(PDB_SymType Type, StringRef Name, PDB_NameSearchFlags Flags) const; diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolAnnotation.h b/include/llvm/DebugInfo/PDB/PDBSymbolAnnotation.h index 5751dcc9dd2..0f1396f361b 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolAnnotation.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolAnnotation.h @@ -23,6 +23,8 @@ public: PDBSymbolAnnotation(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Annotation) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getAddressOffset) @@ -32,10 +34,6 @@ public: FORWARD_SYMBOL_METHOD(getSymIndexId) // FORWARD_SYMBOL_METHOD(getValue) FORWARD_SYMBOL_METHOD(getVirtualAddress) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::Annotation; - } }; } diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolBlock.h b/include/llvm/DebugInfo/PDB/PDBSymbolBlock.h index 760324b8c7d..bbb23fa963e 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolBlock.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolBlock.h @@ -23,6 +23,8 @@ public: PDBSymbolBlock(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Block) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getAddressOffset) @@ -34,10 +36,6 @@ public: FORWARD_SYMBOL_METHOD(getRelativeVirtualAddress) FORWARD_SYMBOL_METHOD(getSymIndexId) FORWARD_SYMBOL_METHOD(getVirtualAddress) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::Block; - } }; } diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolCompiland.h b/include/llvm/DebugInfo/PDB/PDBSymbolCompiland.h index b342444aaf6..610008866f0 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolCompiland.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolCompiland.h @@ -23,6 +23,8 @@ public: PDBSymbolCompiland(const IPDBSession &PDBSession, std::unique_ptr CompilandSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Compiland) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(isEditAndContinueEnabled) @@ -31,10 +33,6 @@ public: FORWARD_SYMBOL_METHOD(getName) FORWARD_SYMBOL_METHOD(getSourceFileName) FORWARD_SYMBOL_METHOD(getSymIndexId) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::Compiland; - } }; } diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h b/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h index dcffabf34fd..d0338550d89 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h @@ -22,6 +22,8 @@ public: PDBSymbolCompilandDetails(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::CompilandDetails) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; void getFrontEndVersion(VersionInfo &Version) const { @@ -46,10 +48,6 @@ public: FORWARD_SYMBOL_METHOD(getLexicalParentId) FORWARD_SYMBOL_METHOD(getPlatform) FORWARD_SYMBOL_METHOD(getSymIndexId) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::CompilandDetails; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h b/include/llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h index dfff3f754b6..c31a33924cc 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h @@ -22,16 +22,14 @@ public: PDBSymbolCompilandEnv(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::CompilandEnv) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getLexicalParentId) FORWARD_SYMBOL_METHOD(getName) FORWARD_SYMBOL_METHOD(getSymIndexId) std::string getValue() const; - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::CompilandEnv; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolCustom.h b/include/llvm/DebugInfo/PDB/PDBSymbolCustom.h index 0c972d8ba08..08019e22f1b 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolCustom.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolCustom.h @@ -27,14 +27,12 @@ public: PDBSymbolCustom(const IPDBSession &PDBSession, std::unique_ptr CustomSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Custom) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; void getDataBytes(llvm::SmallVector &bytes); FORWARD_SYMBOL_METHOD(getSymIndexId) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::Custom; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolData.h b/include/llvm/DebugInfo/PDB/PDBSymbolData.h index e1c074e7298..a67d08f9ad6 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolData.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolData.h @@ -22,6 +22,8 @@ public: PDBSymbolData(const IPDBSession &PDBSession, std::unique_ptr DataSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Data) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getAccess) @@ -50,10 +52,6 @@ public: // FORWARD_SYMBOL_METHOD(getValue) FORWARD_SYMBOL_METHOD(getVirtualAddress) FORWARD_SYMBOL_METHOD(isVolatileType) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::Data; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolExe.h b/include/llvm/DebugInfo/PDB/PDBSymbolExe.h index caac1668ae3..4fa26c72177 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolExe.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolExe.h @@ -24,6 +24,8 @@ public: PDBSymbolExe(const IPDBSession &PDBSession, std::unique_ptr ExeSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Exe) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getAge) @@ -35,10 +37,6 @@ public: FORWARD_SYMBOL_METHOD(getSignature) FORWARD_SYMBOL_METHOD(getSymbolsFileName) FORWARD_SYMBOL_METHOD(getSymIndexId) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::Exe; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolFunc.h b/include/llvm/DebugInfo/PDB/PDBSymbolFunc.h index 4b78c2f5a6c..6b7af0c87fe 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolFunc.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolFunc.h @@ -24,6 +24,8 @@ public: void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Function) + FORWARD_SYMBOL_METHOD(getAccess) FORWARD_SYMBOL_METHOD(getAddressOffset) FORWARD_SYMBOL_METHOD(getAddressSection) @@ -66,10 +68,6 @@ public: FORWARD_SYMBOL_METHOD(getVirtualAddress) FORWARD_SYMBOL_METHOD(getVirtualBaseOffset) FORWARD_SYMBOL_METHOD(isVolatileType) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::Function; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugEnd.h b/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugEnd.h index 15ce8969d47..e974375481a 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugEnd.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugEnd.h @@ -22,6 +22,8 @@ public: PDBSymbolFuncDebugEnd(const IPDBSession &PDBSession, std::unique_ptr FuncDebugEndSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::FuncDebugEnd) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getAddressOffset) @@ -40,10 +42,6 @@ public: FORWARD_SYMBOL_METHOD(getRelativeVirtualAddress) FORWARD_SYMBOL_METHOD(getSymIndexId) FORWARD_SYMBOL_METHOD(getVirtualAddress) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::FuncDebugEnd; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugStart.h b/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugStart.h index 9ad6d3888f7..99de8c06306 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugStart.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugStart.h @@ -22,6 +22,8 @@ public: PDBSymbolFuncDebugStart(const IPDBSession &PDBSession, std::unique_ptr FuncDebugStartSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::FuncDebugStart) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getAddressOffset) @@ -40,10 +42,6 @@ public: FORWARD_SYMBOL_METHOD(getRelativeVirtualAddress) FORWARD_SYMBOL_METHOD(getSymIndexId) FORWARD_SYMBOL_METHOD(getVirtualAddress) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::FuncDebugStart; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolLabel.h b/include/llvm/DebugInfo/PDB/PDBSymbolLabel.h index d7cb6f5a6df..edc75d0078b 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolLabel.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolLabel.h @@ -22,6 +22,8 @@ public: PDBSymbolLabel(const IPDBSession &PDBSession, std::unique_ptr LabelSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Label) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getAddressOffset) @@ -40,10 +42,6 @@ public: FORWARD_SYMBOL_METHOD(getRelativeVirtualAddress) FORWARD_SYMBOL_METHOD(getSymIndexId) FORWARD_SYMBOL_METHOD(getVirtualAddress) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::Label; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolPublicSymbol.h b/include/llvm/DebugInfo/PDB/PDBSymbolPublicSymbol.h index 540cf19ac2f..b99fe16116b 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolPublicSymbol.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolPublicSymbol.h @@ -22,6 +22,8 @@ public: PDBSymbolPublicSymbol(const IPDBSession &PDBSession, std::unique_ptr PublicSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::PublicSymbol) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getAddressOffset) @@ -38,10 +40,6 @@ public: FORWARD_SYMBOL_METHOD(getRelativeVirtualAddress) FORWARD_SYMBOL_METHOD(getVirtualAddress) FORWARD_SYMBOL_METHOD(getUndecoratedName) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::PublicSymbol; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolThunk.h b/include/llvm/DebugInfo/PDB/PDBSymbolThunk.h index 7a2eab204f6..7f1079d16b6 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolThunk.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolThunk.h @@ -24,6 +24,8 @@ public: PDBSymbolThunk(const IPDBSession &PDBSession, std::unique_ptr ThunkSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Thunk) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getAccess) @@ -50,10 +52,6 @@ public: FORWARD_SYMBOL_METHOD(getVirtualAddress) FORWARD_SYMBOL_METHOD(getVirtualBaseOffset) FORWARD_SYMBOL_METHOD(isVolatileType) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::Thunk; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeArray.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeArray.h index ef81d792d3c..42d0f39341b 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeArray.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeArray.h @@ -22,6 +22,8 @@ public: PDBSymbolTypeArray(const IPDBSession &PDBSession, std::unique_ptr ArrayTypeSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::ArrayType) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getArrayIndexTypeId) @@ -34,10 +36,6 @@ public: FORWARD_SYMBOL_METHOD(getTypeId) FORWARD_SYMBOL_METHOD(isUnalignedType) FORWARD_SYMBOL_METHOD(isVolatileType) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::ArrayType; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeBaseClass.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeBaseClass.h index 3cc7a022653..e80caffaf51 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeBaseClass.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeBaseClass.h @@ -22,6 +22,8 @@ public: PDBSymbolTypeBaseClass(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::BaseClass) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getAccess) @@ -51,10 +53,6 @@ public: // FORWARD_SYMBOL_METHOD(getVirtualBaseTableType) FORWARD_SYMBOL_METHOD(getVirtualTableShapeId) FORWARD_SYMBOL_METHOD(isVolatileType) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::BaseClass; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h index 769d4474031..725abe76b69 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h @@ -22,6 +22,8 @@ public: PDBSymbolTypeBuiltin(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::BuiltinType) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getBuiltinType) @@ -31,10 +33,6 @@ public: FORWARD_SYMBOL_METHOD(getSymIndexId) FORWARD_SYMBOL_METHOD(isUnalignedType) FORWARD_SYMBOL_METHOD(isVolatileType) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::BuiltinType; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeCustom.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeCustom.h index 7bdbc9de72a..622c7824e53 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeCustom.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeCustom.h @@ -22,15 +22,13 @@ public: PDBSymbolTypeCustom(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::CustomType) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getOemId) FORWARD_SYMBOL_METHOD(getOemSymbolId) FORWARD_SYMBOL_METHOD(getSymIndexId) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::CustomType; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeDimension.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeDimension.h index 737fdfa6acd..91d8b8789d1 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeDimension.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeDimension.h @@ -22,15 +22,13 @@ public: PDBSymbolTypeDimension(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Dimension) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getLowerBoundId) FORWARD_SYMBOL_METHOD(getUpperBoundId) FORWARD_SYMBOL_METHOD(getSymIndexId) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::Dimension; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h index 63c16b17c46..a1ee01d8262 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h @@ -22,6 +22,8 @@ public: PDBSymbolTypeEnum(const IPDBSession &PDBSession, std::unique_ptr EnumTypeSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Enum) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getBuiltinType) @@ -42,10 +44,6 @@ public: FORWARD_SYMBOL_METHOD(getTypeId) FORWARD_SYMBOL_METHOD(isUnalignedType) FORWARD_SYMBOL_METHOD(isVolatileType) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::Enum; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeFriend.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeFriend.h index 0c63da7d318..1b835b11655 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeFriend.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeFriend.h @@ -22,16 +22,14 @@ public: PDBSymbolTypeFriend(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Friend) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getClassParentId) FORWARD_SYMBOL_METHOD(getName) FORWARD_SYMBOL_METHOD(getSymIndexId) FORWARD_SYMBOL_METHOD(getTypeId) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::Friend; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionArg.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionArg.h index 531ebda67b7..050889244a7 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionArg.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionArg.h @@ -22,16 +22,14 @@ public: PDBSymbolTypeFunctionArg(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::FunctionArg) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getClassParentId) FORWARD_SYMBOL_METHOD(getLexicalParentId) FORWARD_SYMBOL_METHOD(getSymIndexId) FORWARD_SYMBOL_METHOD(getTypeId) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::FunctionArg; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionSig.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionSig.h index 91dab3ece95..3737eccd5db 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionSig.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionSig.h @@ -22,6 +22,8 @@ public: PDBSymbolTypeFunctionSig(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::FunctionSig) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getCallingConvention) @@ -35,10 +37,6 @@ public: FORWARD_SYMBOL_METHOD(getTypeId) FORWARD_SYMBOL_METHOD(isUnalignedType) FORWARD_SYMBOL_METHOD(isVolatileType) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::FunctionSig; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeManaged.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeManaged.h index f5d02f9a60f..ff86f569779 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeManaged.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeManaged.h @@ -22,14 +22,12 @@ public: PDBSymbolTypeManaged(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::ManagedType) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getName) FORWARD_SYMBOL_METHOD(getSymIndexId) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::ManagedType; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypePointer.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypePointer.h index 3a75edde2ab..f0989c1770a 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypePointer.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypePointer.h @@ -22,6 +22,8 @@ public: PDBSymbolTypePointer(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::PointerType) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(isConstType) @@ -32,10 +34,6 @@ public: FORWARD_SYMBOL_METHOD(getTypeId) FORWARD_SYMBOL_METHOD(isUnalignedType) FORWARD_SYMBOL_METHOD(isVolatileType) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::PointerType; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeTypedef.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeTypedef.h index 957d184b858..3afdbf38203 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeTypedef.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeTypedef.h @@ -22,6 +22,8 @@ public: PDBSymbolTypeTypedef(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::Typedef) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getBuiltinType) @@ -45,10 +47,6 @@ public: FORWARD_SYMBOL_METHOD(isUnalignedType) FORWARD_SYMBOL_METHOD(getVirtualTableShapeId) FORWARD_SYMBOL_METHOD(isVolatileType) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::Typedef; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h index 2c86c84c331..2e067fa5372 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h @@ -22,6 +22,8 @@ public: PDBSymbolTypeUDT(const IPDBSession &PDBSession, std::unique_ptr UDTSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::UDT) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getClassParentId) @@ -42,10 +44,6 @@ public: FORWARD_SYMBOL_METHOD(isUnalignedType) FORWARD_SYMBOL_METHOD(getVirtualTableShapeId) FORWARD_SYMBOL_METHOD(isVolatileType) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::UDT; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTable.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTable.h index 0c9a916e44b..a0b26ea11f2 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTable.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTable.h @@ -22,6 +22,8 @@ public: PDBSymbolTypeVTable(const IPDBSession &PDBSession, std::unique_ptr VtblSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::VTable) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getClassParentId) @@ -31,10 +33,6 @@ public: FORWARD_SYMBOL_METHOD(getTypeId) FORWARD_SYMBOL_METHOD(isUnalignedType) FORWARD_SYMBOL_METHOD(isVolatileType) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::VTable; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTableShape.h b/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTableShape.h index 5055c8da62f..a1379a05b82 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTableShape.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTableShape.h @@ -22,6 +22,8 @@ public: PDBSymbolTypeVTableShape(const IPDBSession &PDBSession, std::unique_ptr VtblShapeSymbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::VTableShape) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(isConstType) @@ -30,10 +32,6 @@ public: FORWARD_SYMBOL_METHOD(getSymIndexId) FORWARD_SYMBOL_METHOD(isUnalignedType) FORWARD_SYMBOL_METHOD(isVolatileType) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::VTableShape; - } }; } // namespace llvm diff --git a/include/llvm/DebugInfo/PDB/PDBSymbolUsingNamespace.h b/include/llvm/DebugInfo/PDB/PDBSymbolUsingNamespace.h index 535dc8d0c3f..9d94ed8f775 100644 --- a/include/llvm/DebugInfo/PDB/PDBSymbolUsingNamespace.h +++ b/include/llvm/DebugInfo/PDB/PDBSymbolUsingNamespace.h @@ -22,15 +22,13 @@ public: PDBSymbolUsingNamespace(const IPDBSession &PDBSession, std::unique_ptr Symbol); + DECLARE_PDB_SYMBOL_CONCRETE_TYPE(PDB_SymType::UsingNamespace) + void dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const override; FORWARD_SYMBOL_METHOD(getLexicalParentId) FORWARD_SYMBOL_METHOD(getName) FORWARD_SYMBOL_METHOD(getSymIndexId) - - static bool classof(const PDBSymbol *S) { - return S->getSymTag() == PDB_SymType::UsingNamespace; - } }; } // namespace llvm diff --git a/lib/DebugInfo/PDB/PDBExtras.cpp b/lib/DebugInfo/PDB/PDBExtras.cpp index e7acebc0005..28870870de5 100644 --- a/lib/DebugInfo/PDB/PDBExtras.cpp +++ b/lib/DebugInfo/PDB/PDBExtras.cpp @@ -75,7 +75,7 @@ raw_ostream &llvm::operator<<(raw_ostream &OS, const PDB_RegisterId &Reg) { CASE_OUTPUT_ENUM_CLASS_NAME(PDB_RegisterId, R14, OS) CASE_OUTPUT_ENUM_CLASS_NAME(PDB_RegisterId, R15, OS) default: - OS << "Unknown"; + OS << static_cast(Reg); } return OS; } diff --git a/lib/DebugInfo/PDB/PDBSymbol.cpp b/lib/DebugInfo/PDB/PDBSymbol.cpp index d65a153623a..4b6122b2858 100644 --- a/lib/DebugInfo/PDB/PDBSymbol.cpp +++ b/lib/DebugInfo/PDB/PDBSymbol.cpp @@ -105,8 +105,8 @@ void PDBSymbol::defaultDump(raw_ostream &OS, int Indent, PDB_SymType PDBSymbol::getSymTag() const { return RawSymbol->getSymTag(); } -std::unique_ptr PDBSymbol::findChildren(PDB_SymType Type) const { - return RawSymbol->findChildren(Type); +std::unique_ptr PDBSymbol::findAllChildren() const { + return RawSymbol->findChildren(PDB_SymType::None); } std::unique_ptr @@ -128,7 +128,7 @@ PDBSymbol::findInlineFramesByRVA(uint32_t RVA) const { std::unique_ptr PDBSymbol::getChildStats(TagStats &Stats) const { - std::unique_ptr Result(findChildren(PDB_SymType::None)); + std::unique_ptr Result(findAllChildren()); Stats.clear(); while (auto Child = Result->getNext()) { ++Stats[Child->getSymTag()]; diff --git a/lib/DebugInfo/PDB/PDBSymbolCompiland.cpp b/lib/DebugInfo/PDB/PDBSymbolCompiland.cpp index 13f6cccd0a2..39bb9bc90f1 100644 --- a/lib/DebugInfo/PDB/PDBSymbolCompiland.cpp +++ b/lib/DebugInfo/PDB/PDBSymbolCompiland.cpp @@ -19,6 +19,7 @@ #include "llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h" #include "llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h" #include "llvm/Support/raw_ostream.h" +#include "llvm/Support/Path.h" using namespace llvm; @@ -28,9 +29,11 @@ PDBSymbolCompiland::PDBSymbolCompiland(const IPDBSession &PDBSession, void PDBSymbolCompiland::dump(raw_ostream &OS, int Indent, PDB_DumpLevel Level) const { - std::string Name = getName(); - OS << "---- [IDX: " << getSymIndexId() << "] Compiland: " << Name - << " ----\n"; + 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(); @@ -54,11 +57,8 @@ void PDBSymbolCompiland::dump(raw_ostream &OS, int Indent, } } - std::unique_ptr DetailsEnum( - findChildren(PDB_SymType::CompilandDetails)); - if (auto DetailsPtr = DetailsEnum->getNext()) { - const auto *CD = dyn_cast(DetailsPtr.get()); - assert(CD && "We only asked for compilands, but got something else!"); + auto DetailsEnum(findAllChildren()); + if (auto CD = DetailsEnum->getNext()) { VersionInfo FE; VersionInfo BE; CD->getFrontEndVersion(FE); diff --git a/lib/DebugInfo/PDB/PDBSymbolData.cpp b/lib/DebugInfo/PDB/PDBSymbolData.cpp index f605af26771..bffad8af751 100644 --- a/lib/DebugInfo/PDB/PDBSymbolData.cpp +++ b/lib/DebugInfo/PDB/PDBSymbolData.cpp @@ -25,9 +25,11 @@ void PDBSymbolData::dump(raw_ostream &OS, int Indent, if (Level == PDB_DumpLevel::Compact) { PDB_LocType Loc = getLocationType(); OS << Loc << " data ["; + int Length; switch (Loc) { case PDB_LocType::Static: OS << format_hex(getRelativeVirtualAddress(), 10); + Length = getLength(); break; case PDB_LocType::TLS: OS << getAddressSection() << ":" << format_hex(getAddressOffset(), 10); diff --git a/lib/DebugInfo/PDB/PDBSymbolFunc.cpp b/lib/DebugInfo/PDB/PDBSymbolFunc.cpp index dfb684d1657..17473c17a45 100644 --- a/lib/DebugInfo/PDB/PDBSymbolFunc.cpp +++ b/lib/DebugInfo/PDB/PDBSymbolFunc.cpp @@ -27,35 +27,21 @@ void PDBSymbolFunc::dump(raw_ostream &OS, int Indent, if (Level == PDB_DumpLevel::Compact) { uint32_t FuncStart = getRelativeVirtualAddress(); uint32_t FuncEnd = FuncStart + getLength(); - auto DebugEndSymbol = findChildren(PDB_SymType::FuncDebugEnd); OS << stream_indent(Indent); OS << "[" << format_hex(FuncStart, 8); - if (auto DebugStartEnum = findChildren(PDB_SymType::FuncDebugStart)) { - if (auto StartSym = DebugStartEnum->getNext()) { - auto DebugStart = dyn_cast(StartSym.get()); - OS << "+" << DebugStart->getRelativeVirtualAddress() - FuncStart; - } - } + if (auto DebugStart = findOneChild()) + OS << "+" << DebugStart->getRelativeVirtualAddress() - FuncStart; OS << " - " << format_hex(FuncEnd, 8); - if (auto DebugEndEnum = findChildren(PDB_SymType::FuncDebugEnd)) { - if (auto DebugEndSym = DebugEndEnum->getNext()) { - auto DebugEnd = dyn_cast(DebugEndSym.get()); + if (auto DebugEnd = findOneChild()) OS << "-" << FuncEnd - DebugEnd->getRelativeVirtualAddress(); - } - } OS << "] "; PDB_RegisterId Reg = getLocalBasePointerRegisterId(); if (Reg == PDB_RegisterId::VFrame) OS << "(VFrame)"; - else if (hasFramePointer()) { - if (Reg == PDB_RegisterId::EBP) - OS << "(EBP)"; - else - OS << "(" << (int)Reg << ")"; - } else { + else if (hasFramePointer()) + OS << "(" << Reg << ")"; + else OS << "(FPO)"; - } OS << " " << getName() << "\n"; } - OS.flush(); } diff --git a/lib/DebugInfo/PDB/PDBSymbolThunk.cpp b/lib/DebugInfo/PDB/PDBSymbolThunk.cpp index a7bd96a3479..eac1a544d33 100644 --- a/lib/DebugInfo/PDB/PDBSymbolThunk.cpp +++ b/lib/DebugInfo/PDB/PDBSymbolThunk.cpp @@ -25,11 +25,17 @@ void PDBSymbolThunk::dump(raw_ostream &OS, int Indent, if (Level == PDB_DumpLevel::Compact) { OS.indent(Indent); PDB_ThunkOrdinal Ordinal = getThunkOrdinal(); - OS << "THUNK[" << Ordinal << "] "; - OS << "[" << format_hex(getRelativeVirtualAddress(), 10); + uint32_t RVA = getRelativeVirtualAddress(); + if (Ordinal == PDB_ThunkOrdinal::TrampIncremental) { + OS << format_hex(RVA, 10); + } else { + OS << "[" << format_hex(RVA, 10); + OS << " - " << format_hex(RVA + getLength(), 10) << "]"; + } + OS << " thunk(" << Ordinal << ")"; if (Ordinal == PDB_ThunkOrdinal::TrampIncremental) OS << " -> " << format_hex(getTargetRelativeVirtualAddress(), 10); - OS << "] "; + OS << " "; std::string Name = getName(); if (!Name.empty()) OS << Name; diff --git a/tools/llvm-pdbdump/llvm-pdbdump.cpp b/tools/llvm-pdbdump/llvm-pdbdump.cpp index 6044fda1635..6f66a4cef6b 100644 --- a/tools/llvm-pdbdump/llvm-pdbdump.cpp +++ b/tools/llvm-pdbdump/llvm-pdbdump.cpp @@ -63,11 +63,9 @@ static void dumpInput(StringRef Path) { outs().flush(); if (opts::Compilands) { - auto Compilands = GlobalScope->findChildren(PDB_SymType::Compiland); - if (Compilands) { - while (auto Compiland = Compilands->getNext()) { - Compiland->dump(outs(), 0, PDB_DumpLevel::Normal); - } + auto Compilands = GlobalScope->findAllChildren(); + while (auto Compiland = Compilands->getNext()) { + Compiland->dump(outs(), 0, PDB_DumpLevel::Normal); } } outs().flush(); -- 2.34.1