<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Hi Zachary,<br class=""><br class="">Would it be possible to remove llvm/trunk/lib/DebugInfo/CodeView/TypeDeserializer.cpp now that its appears to be unused?<br class=""><br class=""><a href="http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/10411/steps/build/logs/warnings%20%281%29" class="">http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/10411/steps/build/logs/warnings%20%281%29</a><br class=""><br class="">Simon.<div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On 18 Aug 2016, at 17:49, Zachary Turner via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">Author: zturner<br class="">Date: Thu Aug 18 11:49:29 2016<br class="">New Revision: 279089<br class=""><br class="">URL: <a href="http://llvm.org/viewvc/llvm-project?rev=279089&view=rev" class="">http://llvm.org/viewvc/llvm-project?rev=279089&view=rev</a><br class="">Log:<br class="">Resubmit "Write the TPI stream from a PDB to Yaml."<br class=""><br class="">The original patch was breaking some buildbots due to an<br class="">incorrect ordering of function definitions which caused some<br class="">compilers to recognize a definition but others to not.<br class=""><br class="">Added:<br class=""> llvm/trunk/test/DebugInfo/PDB/pdbdump-yaml-types.test<br class=""> llvm/trunk/tools/llvm-pdbdump/CodeViewYaml.cpp<br class=""> llvm/trunk/tools/llvm-pdbdump/CodeViewYaml.h<br class="">Modified:<br class=""> llvm/trunk/include/llvm/DebugInfo/CodeView/CVTypeVisitor.h<br class=""> llvm/trunk/include/llvm/DebugInfo/CodeView/EnumTables.h<br class=""> llvm/trunk/include/llvm/DebugInfo/CodeView/TypeDeserializer.h<br class=""> llvm/trunk/include/llvm/DebugInfo/CodeView/TypeDumper.h<br class=""> llvm/trunk/include/llvm/DebugInfo/CodeView/TypeRecord.h<br class=""> llvm/trunk/include/llvm/DebugInfo/MSF/StreamReader.h<br class=""> llvm/trunk/lib/DebugInfo/CodeView/CVTypeVisitor.cpp<br class=""> llvm/trunk/lib/DebugInfo/CodeView/EnumTables.cpp<br class=""> llvm/trunk/lib/DebugInfo/CodeView/TypeDeserializer.cpp<br class=""> llvm/trunk/lib/DebugInfo/CodeView/TypeDumper.cpp<br class=""> llvm/trunk/lib/DebugInfo/CodeView/TypeRecord.cpp<br class=""> llvm/trunk/lib/DebugInfo/CodeView/TypeStreamMerger.cpp<br class=""> llvm/trunk/test/DebugInfo/COFF/big-type.ll<br class=""> llvm/trunk/test/DebugInfo/COFF/enum.ll<br class=""> llvm/trunk/test/DebugInfo/COFF/inheritance.ll<br class=""> llvm/trunk/test/DebugInfo/COFF/virtual-method-kinds.ll<br class=""> llvm/trunk/test/DebugInfo/COFF/virtual-methods.ll<br class=""> llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test<br class=""> llvm/trunk/tools/llvm-pdbdump/CMakeLists.txt<br class=""> llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp<br class=""> llvm/trunk/tools/llvm-pdbdump/PdbYaml.h<br class=""> llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.cpp<br class=""> llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.h<br class=""> llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp<br class=""> llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.h<br class=""><br class="">Modified: llvm/trunk/include/llvm/DebugInfo/CodeView/CVTypeVisitor.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/CVTypeVisitor.h?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/CVTypeVisitor.h?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/include/llvm/DebugInfo/CodeView/CVTypeVisitor.h (original)<br class="">+++ llvm/trunk/include/llvm/DebugInfo/CodeView/CVTypeVisitor.h Thu Aug 18 11:49:29 2016<br class="">@@ -28,6 +28,8 @@ public:<br class=""> /// Visits the type records in Data. Sets the error flag on parse failures.<br class=""> Error visitTypeStream(const CVTypeArray &Types);<br class=""><br class="">+ Error visitFieldListMemberStream(ArrayRef<uint8_t> FieldList);<br class="">+<br class=""> private:<br class=""> /// The interface to the class that gets notified of each visitation.<br class=""> TypeVisitorCallbacks &Callbacks;<br class=""><br class="">Modified: llvm/trunk/include/llvm/DebugInfo/CodeView/EnumTables.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/EnumTables.h?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/EnumTables.h?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/include/llvm/DebugInfo/CodeView/EnumTables.h (original)<br class="">+++ llvm/trunk/include/llvm/DebugInfo/CodeView/EnumTables.h Thu Aug 18 11:49:29 2016<br class="">@@ -20,6 +20,7 @@<br class=""> namespace llvm {<br class=""> namespace codeview {<br class=""> ArrayRef<EnumEntry<SymbolKind>> getSymbolTypeNames();<br class="">+ArrayRef<EnumEntry<TypeLeafKind>> getTypeLeafNames();<br class=""> ArrayRef<EnumEntry<uint16_t>> getRegisterNames();<br class=""> ArrayRef<EnumEntry<uint8_t>> getProcSymFlagNames();<br class=""> ArrayRef<EnumEntry<uint16_t>> getLocalFlagNames();<br class=""><br class="">Modified: llvm/trunk/include/llvm/DebugInfo/CodeView/TypeDeserializer.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/TypeDeserializer.h?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/TypeDeserializer.h?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/include/llvm/DebugInfo/CodeView/TypeDeserializer.h (original)<br class="">+++ llvm/trunk/include/llvm/DebugInfo/CodeView/TypeDeserializer.h Thu Aug 18 11:49:29 2016<br class="">@@ -15,9 +15,9 @@<br class=""><br class=""> namespace llvm {<br class=""> namespace codeview {<br class="">-class TypeDeserializerBase : public TypeVisitorCallbacks {<br class="">+class TypeDeserializer : public TypeVisitorCallbacks {<br class=""> public:<br class="">- explicit TypeDeserializerBase(TypeVisitorCallbacks &Recipient)<br class="">+ explicit TypeDeserializer(TypeVisitorCallbacks &Recipient)<br class=""> : Recipient(Recipient) {}<br class=""><br class=""> Error visitTypeBegin(const CVRecord<TypeLeafKind> &Record) override {<br class="">@@ -62,39 +62,6 @@ private:<br class=""> return Recipient.visitKnownRecord(CVR, Record);<br class=""> }<br class=""> };<br class="">-<br class="">-class TypeDeserializer : public TypeDeserializerBase {<br class="">-public:<br class="">- explicit TypeDeserializer(TypeVisitorCallbacks &Recipient)<br class="">- : TypeDeserializerBase(Recipient) {}<br class="">-<br class="">- /// FieldList records need special handling. For starters, they do not<br class="">- /// describe their own length, so a different extraction algorithm is<br class="">- /// necessary. Secondly, a single FieldList record will result in the<br class="">- /// deserialization of many records. So even though the top level visitor<br class="">- /// calls visitFieldBegin() on a single record, multiple records get visited<br class="">- /// through the callback interface.<br class="">- Error visitKnownRecord(const CVRecord<TypeLeafKind> &CVR,<br class="">- FieldListRecord &Record) override;<br class="">-<br class="">-private:<br class="">- template <typename T><br class="">- Error visitKnownMember(ArrayRef<uint8_t> &Data, TypeLeafKind Kind,<br class="">- T &Record) {<br class="">- ArrayRef<uint8_t> OldData = Data;<br class="">- if (auto EC = deserializeRecord(Data, Kind, Record))<br class="">- return EC;<br class="">- assert(Data.size() < OldData.size());<br class="">-<br class="">- CVRecord<TypeLeafKind> CVR;<br class="">- CVR.Length = OldData.size() - Data.size();<br class="">- CVR.Data = OldData.slice(0, CVR.Length);<br class="">- CVR.RawData = CVR.Data;<br class="">- return Recipient.visitKnownRecord(CVR, Record);<br class="">- }<br class="">-<br class="">- Error skipPadding(ArrayRef<uint8_t> &Data);<br class="">-};<br class=""> }<br class=""> }<br class=""><br class=""><br class="">Modified: llvm/trunk/include/llvm/DebugInfo/CodeView/TypeDumper.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/TypeDumper.h?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/TypeDumper.h?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/include/llvm/DebugInfo/CodeView/TypeDumper.h (original)<br class="">+++ llvm/trunk/include/llvm/DebugInfo/CodeView/TypeDumper.h Thu Aug 18 11:49:29 2016<br class="">@@ -87,6 +87,7 @@ private:<br class=""><br class=""> ScopedPrinter *W;<br class=""><br class="">+ bool IsInFieldList = false;<br class=""> bool PrintRecordBytes = false;<br class=""><br class=""> /// Name of the current type. Only valid before visitTypeEnd.<br class=""><br class="">Modified: llvm/trunk/include/llvm/DebugInfo/CodeView/TypeRecord.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/TypeRecord.h?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/TypeRecord.h?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/include/llvm/DebugInfo/CodeView/TypeRecord.h (original)<br class="">+++ llvm/trunk/include/llvm/DebugInfo/CodeView/TypeRecord.h Thu Aug 18 11:49:29 2016<br class="">@@ -12,6 +12,7 @@<br class=""><br class=""> #include "llvm/ADT/APSInt.h"<br class=""> #include "llvm/ADT/ArrayRef.h"<br class="">+#include "llvm/ADT/Optional.h"<br class=""> #include "llvm/ADT/StringRef.h"<br class=""> #include "llvm/DebugInfo/CodeView/CVRecord.h"<br class=""> #include "llvm/DebugInfo/CodeView/CodeView.h"<br class="">@@ -27,6 +28,9 @@ using llvm::support::little32_t;<br class=""> using llvm::support::ulittle16_t;<br class=""> using llvm::support::ulittle32_t;<br class=""><br class="">+typedef CVRecord<TypeLeafKind> CVType;<br class="">+typedef msf::VarStreamArray<CVType> CVTypeArray;<br class="">+<br class=""> /// Equvalent to CV_fldattr_t in cvinfo.h.<br class=""> struct MemberAttributes {<br class=""> ulittle16_t Attrs;<br class="">@@ -90,18 +94,19 @@ public:<br class=""> return Representation;<br class=""> }<br class=""><br class="">+ TypeIndex ContainingType;<br class="">+ PointerToMemberRepresentation Representation;<br class="">+<br class=""> private:<br class=""> struct Layout {<br class=""> TypeIndex ClassType;<br class=""> ulittle16_t Representation; // PointerToMemberRepresentation<br class=""> };<br class="">-<br class="">- TypeIndex ContainingType;<br class="">- PointerToMemberRepresentation Representation;<br class=""> };<br class=""><br class=""> class TypeRecord {<br class=""> protected:<br class="">+ TypeRecord() {}<br class=""> explicit TypeRecord(TypeRecordKind Kind) : Kind(Kind) {}<br class=""><br class=""> public:<br class="">@@ -129,14 +134,14 @@ public:<br class=""> TypeIndex getModifiedType() const { return ModifiedType; }<br class=""> ModifierOptions getModifiers() const { return Modifiers; }<br class=""><br class="">+ TypeIndex ModifiedType;<br class="">+ ModifierOptions Modifiers;<br class="">+<br class=""> private:<br class=""> struct Layout {<br class=""> TypeIndex ModifiedType;<br class=""> ulittle16_t Modifiers; // ModifierOptions<br class=""> };<br class="">-<br class="">- TypeIndex ModifiedType;<br class="">- ModifierOptions Modifiers;<br class=""> };<br class=""><br class=""> // LF_PROCEDURE<br class="">@@ -165,6 +170,12 @@ public:<br class=""> uint16_t getParameterCount() const { return ParameterCount; }<br class=""> TypeIndex getArgumentList() const { return ArgumentList; }<br class=""><br class="">+ TypeIndex ReturnType;<br class="">+ CallingConvention CallConv;<br class="">+ FunctionOptions Options;<br class="">+ uint16_t ParameterCount;<br class="">+ TypeIndex ArgumentList;<br class="">+<br class=""> private:<br class=""> struct Layout {<br class=""> TypeIndex ReturnType;<br class="">@@ -173,12 +184,6 @@ private:<br class=""> ulittle16_t NumParameters;<br class=""> TypeIndex ArgListType;<br class=""> };<br class="">-<br class="">- TypeIndex ReturnType;<br class="">- CallingConvention CallConv;<br class="">- FunctionOptions Options;<br class="">- uint16_t ParameterCount;<br class="">- TypeIndex ArgumentList;<br class=""> };<br class=""><br class=""> // LF_MFUNCTION<br class="">@@ -212,6 +217,15 @@ public:<br class=""> TypeIndex getArgumentList() const { return ArgumentList; }<br class=""> int32_t getThisPointerAdjustment() const { return ThisPointerAdjustment; }<br class=""><br class="">+ TypeIndex ReturnType;<br class="">+ TypeIndex ClassType;<br class="">+ TypeIndex ThisType;<br class="">+ CallingConvention CallConv;<br class="">+ FunctionOptions Options;<br class="">+ uint16_t ParameterCount;<br class="">+ TypeIndex ArgumentList;<br class="">+ int32_t ThisPointerAdjustment;<br class="">+<br class=""> private:<br class=""> struct Layout {<br class=""> TypeIndex ReturnType;<br class="">@@ -223,15 +237,6 @@ private:<br class=""> TypeIndex ArgListType;<br class=""> little32_t ThisAdjustment;<br class=""> };<br class="">-<br class="">- TypeIndex ReturnType;<br class="">- TypeIndex ClassType;<br class="">- TypeIndex ThisType;<br class="">- CallingConvention CallConv;<br class="">- FunctionOptions Options;<br class="">- uint16_t ParameterCount;<br class="">- TypeIndex ArgumentList;<br class="">- int32_t ThisPointerAdjustment;<br class=""> };<br class=""><br class=""> // LF_MFUNC_ID<br class="">@@ -252,6 +257,9 @@ public:<br class=""> TypeIndex getClassType() const { return ClassType; }<br class=""> TypeIndex getFunctionType() const { return FunctionType; }<br class=""> StringRef getName() const { return Name; }<br class="">+ TypeIndex ClassType;<br class="">+ TypeIndex FunctionType;<br class="">+ StringRef Name;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -259,9 +267,6 @@ private:<br class=""> TypeIndex FunctionType;<br class=""> // Name: The null-terminated name follows.<br class=""> };<br class="">- TypeIndex ClassType;<br class="">- TypeIndex FunctionType;<br class="">- StringRef Name;<br class=""> };<br class=""><br class=""> // LF_ARGLIST, LF_SUBSTR_LIST<br class="">@@ -283,13 +288,13 @@ public:<br class=""><br class=""> static uint32_t getLayoutSize() { return 2 + sizeof(Layout); }<br class=""><br class="">+ std::vector<TypeIndex> StringIndices;<br class="">+<br class=""> private:<br class=""> struct Layout {<br class=""> ulittle32_t NumArgs; // Number of arguments<br class=""> // ArgTypes[]: Type indicies of arguments<br class=""> };<br class="">-<br class="">- std::vector<TypeIndex> StringIndices;<br class=""> };<br class=""><br class=""> // LF_POINTER<br class="">@@ -308,8 +313,8 @@ public:<br class=""><br class=""> PointerRecord(TypeIndex ReferentType, PointerKind Kind, PointerMode Mode,<br class=""> PointerOptions Options, uint8_t Size)<br class="">- : PointerRecord(ReferentType, Kind, Mode, Options, Size,<br class="">- MemberPointerInfo()) {}<br class="">+ : TypeRecord(TypeRecordKind::Pointer), ReferentType(ReferentType),<br class="">+ PtrKind(Kind), Mode(Mode), Options(Options), Size(Size) {}<br class=""><br class=""> PointerRecord(TypeIndex ReferentType, PointerKind Kind, PointerMode Mode,<br class=""> PointerOptions Options, uint8_t Size,<br class="">@@ -330,7 +335,7 @@ public:<br class=""> PointerMode getMode() const { return Mode; }<br class=""> PointerOptions getOptions() const { return Options; }<br class=""> uint8_t getSize() const { return Size; }<br class="">- MemberPointerInfo getMemberInfo() const { return MemberInfo; }<br class="">+ MemberPointerInfo getMemberInfo() const { return *MemberInfo; }<br class=""><br class=""> bool isPointerToMember() const {<br class=""> return Mode == PointerMode::PointerToDataMember ||<br class="">@@ -349,6 +354,13 @@ public:<br class=""> return !!(uint32_t(Options) & uint32_t(PointerOptions::Unaligned));<br class=""> }<br class=""><br class="">+ TypeIndex ReferentType;<br class="">+ PointerKind PtrKind;<br class="">+ PointerMode Mode;<br class="">+ PointerOptions Options;<br class="">+ uint8_t Size;<br class="">+ Optional<MemberPointerInfo> MemberInfo;<br class="">+<br class=""> private:<br class=""> struct Layout {<br class=""> TypeIndex PointeeType;<br class="">@@ -379,13 +391,6 @@ private:<br class=""> return isPointerToMemberFunction() || isPointerToDataMember();<br class=""> }<br class=""> };<br class="">-<br class="">- TypeIndex ReferentType;<br class="">- PointerKind PtrKind;<br class="">- PointerMode Mode;<br class="">- PointerOptions Options;<br class="">- uint8_t Size;<br class="">- MemberPointerInfo MemberInfo;<br class=""> };<br class=""><br class=""> // LF_NESTTYPE<br class="">@@ -405,23 +410,23 @@ public:<br class=""> TypeIndex getNestedType() const { return Type; }<br class=""> StringRef getName() const { return Name; }<br class=""><br class="">+ TypeIndex Type;<br class="">+ StringRef Name;<br class="">+<br class=""> private:<br class=""> struct Layout {<br class=""> ulittle16_t Pad0; // Should be zero<br class=""> TypeIndex Type; // Type index of nested type<br class=""> // Name: Null-terminated string<br class=""> };<br class="">-<br class="">- TypeIndex Type;<br class="">- StringRef Name;<br class=""> };<br class=""><br class=""> // LF_FIELDLIST<br class=""> class FieldListRecord : public TypeRecord {<br class=""> public:<br class=""> explicit FieldListRecord(TypeRecordKind Kind) : TypeRecord(Kind) {}<br class="">- FieldListRecord(ArrayRef<uint8_t> ListData)<br class="">- : TypeRecord(TypeRecordKind::FieldList), ListData(ListData) {}<br class="">+ explicit FieldListRecord(ArrayRef<uint8_t> Data)<br class="">+ : TypeRecord(TypeRecordKind::FieldList), Data(Data) {}<br class=""><br class=""> /// Rewrite member type indices with IndexMap. Returns false if a type index<br class=""> /// is not in the map.<br class="">@@ -430,10 +435,7 @@ public:<br class=""> static Expected<FieldListRecord> deserialize(TypeRecordKind Kind,<br class=""> ArrayRef<uint8_t> &Data);<br class=""><br class="">- ArrayRef<uint8_t> getFieldListData() const { return ListData; }<br class="">-<br class="">-private:<br class="">- ArrayRef<uint8_t> ListData;<br class="">+ ArrayRef<uint8_t> Data;<br class=""> };<br class=""><br class=""> // LF_ARRAY<br class="">@@ -457,6 +459,11 @@ public:<br class=""> uint64_t getSize() const { return Size; }<br class=""> llvm::StringRef getName() const { return Name; }<br class=""><br class="">+ TypeIndex ElementType;<br class="">+ TypeIndex IndexType;<br class="">+ uint64_t Size;<br class="">+ llvm::StringRef Name;<br class="">+<br class=""> private:<br class=""> struct Layout {<br class=""> TypeIndex ElementType;<br class="">@@ -464,11 +471,6 @@ private:<br class=""> // SizeOf: LF_NUMERIC encoded size in bytes. Not element count!<br class=""> // Name: The null-terminated name follows.<br class=""> };<br class="">-<br class="">- TypeIndex ElementType;<br class="">- TypeIndex IndexType;<br class="">- uint64_t Size;<br class="">- llvm::StringRef Name;<br class=""> };<br class=""><br class=""> class TagRecord : public TypeRecord {<br class="">@@ -495,7 +497,6 @@ public:<br class=""> StringRef getName() const { return Name; }<br class=""> StringRef getUniqueName() const { return UniqueName; }<br class=""><br class="">-private:<br class=""> uint16_t MemberCount;<br class=""> ClassOptions Options;<br class=""> TypeIndex FieldList;<br class="">@@ -528,6 +529,12 @@ public:<br class=""> TypeIndex getVTableShape() const { return VTableShape; }<br class=""> uint64_t getSize() const { return Size; }<br class=""><br class="">+ HfaKind Hfa;<br class="">+ WindowsRTClassKind WinRTKind;<br class="">+ TypeIndex DerivationList;<br class="">+ TypeIndex VTableShape;<br class="">+ uint64_t Size;<br class="">+<br class=""> private:<br class=""> struct Layout {<br class=""> ulittle16_t MemberCount; // Number of members in FieldList.<br class="">@@ -543,12 +550,6 @@ private:<br class=""> return Properties & uint16_t(ClassOptions::HasUniqueName);<br class=""> }<br class=""> };<br class="">-<br class="">- HfaKind Hfa;<br class="">- WindowsRTClassKind WinRTKind;<br class="">- TypeIndex DerivationList;<br class="">- TypeIndex VTableShape;<br class="">- uint64_t Size;<br class=""> };<br class=""><br class=""> // LF_UNION<br class="">@@ -567,6 +568,9 @@ struct UnionRecord : public TagRecord {<br class=""> HfaKind getHfa() const { return Hfa; }<br class=""> uint64_t getSize() const { return Size; }<br class=""><br class="">+ HfaKind Hfa;<br class="">+ uint64_t Size;<br class="">+<br class=""> private:<br class=""> struct Layout {<br class=""> ulittle16_t MemberCount; // Number of members in FieldList.<br class="">@@ -580,9 +584,6 @@ private:<br class=""> return Properties & uint16_t(ClassOptions::HasUniqueName);<br class=""> }<br class=""> };<br class="">-<br class="">- HfaKind Hfa;<br class="">- uint64_t Size;<br class=""> };<br class=""><br class=""> // LF_ENUM<br class="">@@ -602,6 +603,7 @@ public:<br class=""> ArrayRef<uint8_t> &Data);<br class=""><br class=""> TypeIndex getUnderlyingType() const { return UnderlyingType; }<br class="">+ TypeIndex UnderlyingType;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -616,7 +618,6 @@ private:<br class=""> }<br class=""> };<br class=""><br class="">- TypeIndex UnderlyingType;<br class=""> };<br class=""><br class=""> // LF_BITFIELD<br class="">@@ -637,6 +638,9 @@ public:<br class=""> TypeIndex getType() const { return Type; }<br class=""> uint8_t getBitOffset() const { return BitOffset; }<br class=""> uint8_t getBitSize() const { return BitSize; }<br class="">+ TypeIndex Type;<br class="">+ uint8_t BitSize;<br class="">+ uint8_t BitOffset;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -645,9 +649,6 @@ private:<br class=""> uint8_t BitOffset;<br class=""> };<br class=""><br class="">- TypeIndex Type;<br class="">- uint8_t BitSize;<br class="">- uint8_t BitOffset;<br class=""> };<br class=""><br class=""> // LF_VTSHAPE<br class="">@@ -672,6 +673,8 @@ public:<br class=""> return Slots;<br class=""> }<br class=""> uint32_t getEntryCount() const { return getSlots().size(); }<br class="">+ ArrayRef<VFTableSlotKind> SlotsRef;<br class="">+ std::vector<VFTableSlotKind> Slots;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -682,9 +685,6 @@ private:<br class=""> // Descriptors[]: 4-bit virtual method descriptors of type CV_VTS_desc_e.<br class=""> };<br class=""><br class="">-private:<br class="">- ArrayRef<VFTableSlotKind> SlotsRef;<br class="">- std::vector<VFTableSlotKind> Slots;<br class=""> };<br class=""><br class=""> // LF_TYPESERVER2<br class="">@@ -707,6 +707,9 @@ public:<br class=""> uint32_t getAge() const { return Age; }<br class=""><br class=""> StringRef getName() const { return Name; }<br class="">+ StringRef Guid;<br class="">+ uint32_t Age;<br class="">+ StringRef Name;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -714,10 +717,6 @@ private:<br class=""> ulittle32_t Age;<br class=""> // Name: Name of the PDB as a null-terminated string<br class=""> };<br class="">-<br class="">- StringRef Guid;<br class="">- uint32_t Age;<br class="">- StringRef Name;<br class=""> };<br class=""><br class=""> // LF_STRING_ID<br class="">@@ -737,15 +736,14 @@ public:<br class=""> TypeIndex getId() const { return Id; }<br class=""><br class=""> StringRef getString() const { return String; }<br class="">+ TypeIndex Id;<br class="">+ StringRef String;<br class=""><br class=""> private:<br class=""> struct Layout {<br class=""> TypeIndex id;<br class=""> // Name: Name of the PDB as a null-terminated string<br class=""> };<br class="">-<br class="">- TypeIndex Id;<br class="">- StringRef String;<br class=""> };<br class=""><br class=""> // LF_FUNC_ID<br class="">@@ -768,6 +766,9 @@ public:<br class=""> TypeIndex getFunctionType() const { return FunctionType; }<br class=""><br class=""> StringRef getName() const { return Name; }<br class="">+ TypeIndex ParentScope;<br class="">+ TypeIndex FunctionType;<br class="">+ StringRef Name;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -776,9 +777,6 @@ private:<br class=""> // Name: The null-terminated name follows.<br class=""> };<br class=""><br class="">- TypeIndex ParentScope;<br class="">- TypeIndex FunctionType;<br class="">- StringRef Name;<br class=""> };<br class=""><br class=""> // LF_UDT_SRC_LINE<br class="">@@ -799,6 +797,9 @@ public:<br class=""> TypeIndex getUDT() const { return UDT; }<br class=""> TypeIndex getSourceFile() const { return SourceFile; }<br class=""> uint32_t getLineNumber() const { return LineNumber; }<br class="">+ TypeIndex UDT;<br class="">+ TypeIndex SourceFile;<br class="">+ uint32_t LineNumber;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -807,9 +808,6 @@ private:<br class=""> ulittle32_t LineNumber;<br class=""> };<br class=""><br class="">- TypeIndex UDT;<br class="">- TypeIndex SourceFile;<br class="">- uint32_t LineNumber;<br class=""> };<br class=""><br class=""> // LF_UDT_MOD_SRC_LINE<br class="">@@ -836,6 +834,10 @@ public:<br class=""> TypeIndex getSourceFile() const { return SourceFile; }<br class=""> uint32_t getLineNumber() const { return LineNumber; }<br class=""> uint16_t getModule() const { return Module; }<br class="">+ TypeIndex UDT;<br class="">+ TypeIndex SourceFile;<br class="">+ uint32_t LineNumber;<br class="">+ uint16_t Module;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -845,10 +847,6 @@ private:<br class=""> ulittle16_t Module; // Module that contributes this UDT definition<br class=""> };<br class=""><br class="">- TypeIndex UDT;<br class="">- TypeIndex SourceFile;<br class="">- uint32_t LineNumber;<br class="">- uint16_t Module;<br class=""> };<br class=""><br class=""> // LF_BUILDINFO<br class="">@@ -867,13 +865,13 @@ public:<br class=""> ArrayRef<uint8_t> &Data);<br class=""><br class=""> ArrayRef<TypeIndex> getArgs() const { return ArgIndices; }<br class="">+ SmallVector<TypeIndex, 4> ArgIndices;<br class=""><br class=""> private:<br class=""> struct Layout {<br class=""> ulittle16_t NumArgs; // Number of arguments<br class=""> // ArgTypes[]: Type indicies of arguments<br class=""> };<br class="">- SmallVector<TypeIndex, 4> ArgIndices;<br class=""> };<br class=""><br class=""> // LF_VFTABLE<br class="">@@ -909,6 +907,12 @@ public:<br class=""> return MethodNamesRef;<br class=""> return MethodNames;<br class=""> }<br class="">+ TypeIndex CompleteClass;<br class="">+ TypeIndex OverriddenVFTable;<br class="">+ ulittle32_t VFPtrOffset;<br class="">+ StringRef Name;<br class="">+ ArrayRef<StringRef> MethodNamesRef;<br class="">+ std::vector<StringRef> MethodNames;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -920,17 +924,12 @@ private:<br class=""> // names.<br class=""> };<br class=""><br class="">- TypeIndex CompleteClass;<br class="">- TypeIndex OverriddenVFTable;<br class="">- ulittle32_t VFPtrOffset;<br class="">- StringRef Name;<br class="">- ArrayRef<StringRef> MethodNamesRef;<br class="">- std::vector<StringRef> MethodNames;<br class=""> };<br class=""><br class=""> // LF_ONEMETHOD<br class=""> class OneMethodRecord : public TypeRecord {<br class=""> public:<br class="">+ OneMethodRecord() : TypeRecord(TypeRecordKind::OneMethod) {}<br class=""> explicit OneMethodRecord(TypeRecordKind Kind) : TypeRecord(Kind) {}<br class=""> OneMethodRecord(TypeIndex Type, MethodKind Kind, MethodOptions Options,<br class=""> MemberAccess Access, int32_t VFTableOffset, StringRef Name)<br class="">@@ -956,6 +955,12 @@ public:<br class=""> return Kind == MethodKind::IntroducingVirtual ||<br class=""> Kind == MethodKind::PureIntroducingVirtual;<br class=""> }<br class="">+ TypeIndex Type;<br class="">+ MethodKind Kind;<br class="">+ MethodOptions Options;<br class="">+ MemberAccess Access;<br class="">+ int32_t VFTableOffset;<br class="">+ StringRef Name;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -966,12 +971,6 @@ private:<br class=""> // Name: Null-terminated string<br class=""> };<br class=""><br class="">- TypeIndex Type;<br class="">- MethodKind Kind;<br class="">- MethodOptions Options;<br class="">- MemberAccess Access;<br class="">- int32_t VFTableOffset;<br class="">- StringRef Name;<br class=""> };<br class=""><br class=""> // LF_METHODLIST<br class="">@@ -989,6 +988,7 @@ public:<br class=""> deserialize(TypeRecordKind Kind, ArrayRef<uint8_t> &Data);<br class=""><br class=""> ArrayRef<OneMethodRecord> getMethods() const { return Methods; }<br class="">+ std::vector<OneMethodRecord> Methods;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -1000,7 +1000,6 @@ private:<br class=""> // VFTableOffset: int32_t offset in vftable<br class=""> };<br class=""><br class="">- std::vector<OneMethodRecord> Methods;<br class=""> };<br class=""><br class=""> /// For method overload sets. LF_METHOD<br class="">@@ -1022,6 +1021,9 @@ public:<br class=""> uint16_t getNumOverloads() const { return NumOverloads; }<br class=""> TypeIndex getMethodList() const { return MethodList; }<br class=""> StringRef getName() const { return Name; }<br class="">+ uint16_t NumOverloads;<br class="">+ TypeIndex MethodList;<br class="">+ StringRef Name;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -1030,9 +1032,6 @@ private:<br class=""> // Name: Null-terminated string<br class=""> };<br class=""><br class="">- uint16_t NumOverloads;<br class="">- TypeIndex MethodList;<br class="">- StringRef Name;<br class=""> };<br class=""><br class=""> // LF_MEMBER<br class="">@@ -1055,6 +1054,10 @@ public:<br class=""> TypeIndex getType() const { return Type; }<br class=""> uint64_t getFieldOffset() const { return FieldOffset; }<br class=""> StringRef getName() const { return Name; }<br class="">+ MemberAccess Access;<br class="">+ TypeIndex Type;<br class="">+ uint64_t FieldOffset;<br class="">+ StringRef Name;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -1064,10 +1067,6 @@ private:<br class=""> // Name: Null-terminated string<br class=""> };<br class=""><br class="">- MemberAccess Access;<br class="">- TypeIndex Type;<br class="">- uint64_t FieldOffset;<br class="">- StringRef Name;<br class=""> };<br class=""><br class=""> // LF_STMEMBER<br class="">@@ -1088,6 +1087,9 @@ public:<br class=""> MemberAccess getAccess() const { return Access; }<br class=""> TypeIndex getType() const { return Type; }<br class=""> StringRef getName() const { return Name; }<br class="">+ MemberAccess Access;<br class="">+ TypeIndex Type;<br class="">+ StringRef Name;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -1096,9 +1098,6 @@ private:<br class=""> // Name: Null-terminated string<br class=""> };<br class=""><br class="">- MemberAccess Access;<br class="">- TypeIndex Type;<br class="">- StringRef Name;<br class=""> };<br class=""><br class=""> // LF_ENUMERATE<br class="">@@ -1119,6 +1118,9 @@ public:<br class=""> MemberAccess getAccess() const { return Access; }<br class=""> APSInt getValue() const { return Value; }<br class=""> StringRef getName() const { return Name; }<br class="">+ MemberAccess Access;<br class="">+ APSInt Value;<br class="">+ StringRef Name;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -1127,9 +1129,6 @@ private:<br class=""> // Name: Null-terminated string<br class=""> };<br class=""><br class="">- MemberAccess Access;<br class="">- APSInt Value;<br class="">- StringRef Name;<br class=""> };<br class=""><br class=""> // LF_VFUNCTAB<br class="">@@ -1147,13 +1146,13 @@ public:<br class=""> ArrayRef<uint8_t> &Data);<br class=""><br class=""> TypeIndex getType() const { return Type; }<br class="">+ TypeIndex Type;<br class=""><br class=""> private:<br class=""> struct Layout {<br class=""> ulittle16_t Pad0;<br class=""> TypeIndex Type; // Type of vfptr<br class=""> };<br class="">- TypeIndex Type;<br class=""> };<br class=""><br class=""> // LF_BCLASS, LF_BINTERFACE<br class="">@@ -1174,6 +1173,9 @@ public:<br class=""> MemberAccess getAccess() const { return Access; }<br class=""> TypeIndex getBaseType() const { return Type; }<br class=""> uint64_t getBaseOffset() const { return Offset; }<br class="">+ MemberAccess Access;<br class="">+ TypeIndex Type;<br class="">+ uint64_t Offset;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -1181,9 +1183,6 @@ private:<br class=""> TypeIndex BaseType; // Base class type<br class=""> // BaseOffset: LF_NUMERIC encoded byte offset of base from derived.<br class=""> };<br class="">- MemberAccess Access;<br class="">- TypeIndex Type;<br class="">- uint64_t Offset;<br class=""> };<br class=""><br class=""> // LF_VBCLASS, LF_IVBCLASS<br class="">@@ -1208,6 +1207,11 @@ public:<br class=""> TypeIndex getVBPtrType() const { return VBPtrType; }<br class=""> uint64_t getVBPtrOffset() const { return VBPtrOffset; }<br class=""> uint64_t getVTableIndex() const { return VTableIndex; }<br class="">+ MemberAccess Access;<br class="">+ TypeIndex BaseType;<br class="">+ TypeIndex VBPtrType;<br class="">+ uint64_t VBPtrOffset;<br class="">+ uint64_t VTableIndex;<br class=""><br class=""> private:<br class=""> struct Layout {<br class="">@@ -1217,11 +1221,6 @@ private:<br class=""> // VBPtrOffset: Offset of vbptr from vfptr encoded as LF_NUMERIC.<br class=""> // VBTableIndex: Index of vbase within vbtable encoded as LF_NUMERIC.<br class=""> };<br class="">- MemberAccess Access;<br class="">- TypeIndex BaseType;<br class="">- TypeIndex VBPtrType;<br class="">- uint64_t VBPtrOffset;<br class="">- uint64_t VTableIndex;<br class=""> };<br class=""><br class=""> /// LF_INDEX - Used to chain two large LF_FIELDLIST or LF_METHODLIST records<br class="">@@ -1239,17 +1238,15 @@ public:<br class=""><br class=""> static Expected<ListContinuationRecord> deserialize(TypeRecordKind Kind,<br class=""> ArrayRef<uint8_t> &Data);<br class="">+ TypeIndex ContinuationIndex;<br class=""><br class=""> private:<br class=""> struct Layout {<br class=""> ulittle16_t Pad0;<br class=""> TypeIndex ContinuationIndex;<br class=""> };<br class="">- TypeIndex ContinuationIndex;<br class=""> };<br class=""><br class="">-typedef CVRecord<TypeLeafKind> CVType;<br class="">-typedef msf::VarStreamArray<CVType> CVTypeArray;<br class=""> }<br class=""> }<br class=""><br class=""><br class="">Modified: llvm/trunk/include/llvm/DebugInfo/MSF/StreamReader.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/MSF/StreamReader.h?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/MSF/StreamReader.h?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/include/llvm/DebugInfo/MSF/StreamReader.h (original)<br class="">+++ llvm/trunk/include/llvm/DebugInfo/MSF/StreamReader.h Thu Aug 18 11:49:29 2016<br class="">@@ -95,6 +95,7 @@ public:<br class=""> return Error::success();<br class=""> }<br class=""><br class="">+ bool empty() const { return bytesRemaining() == 0; }<br class=""> void setOffset(uint32_t Off) { Offset = Off; }<br class=""> uint32_t getOffset() const { return Offset; }<br class=""> uint32_t getLength() const { return Stream.getLength(); }<br class=""><br class="">Modified: llvm/trunk/lib/DebugInfo/CodeView/CVTypeVisitor.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/CVTypeVisitor.cpp?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/CVTypeVisitor.cpp?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/lib/DebugInfo/CodeView/CVTypeVisitor.cpp (original)<br class="">+++ llvm/trunk/lib/DebugInfo/CodeView/CVTypeVisitor.cpp Thu Aug 18 11:49:29 2016<br class="">@@ -15,6 +15,52 @@<br class=""> using namespace llvm;<br class=""> using namespace llvm::codeview;<br class=""><br class="">+template <typename T><br class="">+static Error takeObject(ArrayRef<uint8_t> &Data, const T *&Res) {<br class="">+ if (Data.size() < sizeof(*Res))<br class="">+ return llvm::make_error<CodeViewError>(cv_error_code::insufficient_buffer);<br class="">+ Res = reinterpret_cast<const T *>(Data.data());<br class="">+ Data = Data.drop_front(sizeof(*Res));<br class="">+ return Error::success();<br class="">+}<br class="">+<br class="">+static Error skipPadding(ArrayRef<uint8_t> &Data) {<br class="">+ if (Data.empty())<br class="">+ return Error::success();<br class="">+ uint8_t Leaf = Data.front();<br class="">+ if (Leaf < LF_PAD0)<br class="">+ return Error::success();<br class="">+ // Leaf is greater than 0xf0. We should advance by the number of bytes in<br class="">+ // the low 4 bits.<br class="">+ unsigned BytesToAdvance = Leaf & 0x0F;<br class="">+ if (Data.size() < BytesToAdvance) {<br class="">+ return llvm::make_error<CodeViewError>(cv_error_code::corrupt_record,<br class="">+ "Invalid padding bytes!");<br class="">+ }<br class="">+ Data = Data.drop_front(BytesToAdvance);<br class="">+ return Error::success();<br class="">+}<br class="">+<br class="">+template <typename T><br class="">+static Expected<CVType> deserializeMemberRecord(ArrayRef<uint8_t> &Data,<br class="">+ TypeLeafKind Kind) {<br class="">+ ArrayRef<uint8_t> OldData = Data;<br class="">+ TypeRecordKind RK = static_cast<TypeRecordKind>(Kind);<br class="">+ auto ExpectedRecord = T::deserialize(RK, Data);<br class="">+ if (!ExpectedRecord)<br class="">+ return ExpectedRecord.takeError();<br class="">+ assert(Data.size() < OldData.size());<br class="">+ if (auto EC = skipPadding(Data))<br class="">+ return std::move(EC);<br class="">+<br class="">+ CVType CVR;<br class="">+ CVR.Type = Kind;<br class="">+ CVR.Length = OldData.size() - Data.size();<br class="">+ CVR.Data = OldData.slice(0, CVR.Length);<br class="">+ CVR.RawData = CVR.Data;<br class="">+ return CVR;<br class="">+}<br class="">+<br class=""> CVTypeVisitor::CVTypeVisitor(TypeVisitorCallbacks &Callbacks)<br class=""> : Callbacks(Callbacks) {}<br class=""><br class="">@@ -45,7 +91,10 @@ Error CVTypeVisitor::visitTypeRecord(con<br class=""> }<br class=""> #define TYPE_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName) \<br class=""> TYPE_RECORD(EnumVal, EnumVal, AliasName)<br class="">-#define MEMBER_RECORD(EnumName, EnumVal, Name)<br class="">+#define MEMBER_RECORD(EnumName, EnumVal, Name) \<br class="">+ TYPE_RECORD(EnumName, EnumVal, Name)<br class="">+#define MEMBER_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName) \<br class="">+ MEMBER_RECORD(EnumName, EnumVal, AliasName)<br class=""> #include "llvm/DebugInfo/CodeView/TypeRecords.def"<br class=""> }<br class=""><br class="">@@ -63,3 +112,39 @@ Error CVTypeVisitor::visitTypeStream(con<br class=""> }<br class=""> return Error::success();<br class=""> }<br class="">+<br class="">+Error CVTypeVisitor::visitFieldListMemberStream(ArrayRef<uint8_t> Data) {<br class="">+ while (!Data.empty()) {<br class="">+ const support::ulittle16_t *LeafValue;<br class="">+ if (auto EC = takeObject(Data, LeafValue))<br class="">+ return EC;<br class="">+<br class="">+ TypeLeafKind Leaf = static_cast<TypeLeafKind>(uint16_t(*LeafValue));<br class="">+ CVType Record;<br class="">+ switch (Leaf) {<br class="">+ default:<br class="">+ // Field list records do not describe their own length, so we cannot<br class="">+ // continue parsing past a type that we don't know how to deserialize.<br class="">+ return llvm::make_error<CodeViewError>(<br class="">+ cv_error_code::unknown_member_record);<br class="">+#define MEMBER_RECORD(EnumName, EnumVal, Name) \<br class="">+ case EnumName: { \<br class="">+ auto ExpectedRecord = deserializeMemberRecord<Name##Record>(Data, Leaf); \<br class="">+ if (!ExpectedRecord) \<br class="">+ return ExpectedRecord.takeError(); \<br class="">+ auto &Record = *ExpectedRecord; \<br class="">+ if (auto EC = Callbacks.visitTypeBegin(Record)) \<br class="">+ return EC; \<br class="">+ if (auto EC = visitKnownRecord<Name##Record>(Record, Callbacks)) \<br class="">+ return EC; \<br class="">+ if (auto EC = Callbacks.visitTypeEnd(Record)) \<br class="">+ return EC; \<br class="">+ break; \<br class="">+ }<br class="">+#define MEMBER_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName) \<br class="">+ MEMBER_RECORD(EnumVal, EnumVal, AliasName)<br class="">+#include "llvm/DebugInfo/CodeView/TypeRecords.def"<br class="">+ }<br class="">+ }<br class="">+ return Error::success();<br class="">+}<br class=""><br class="">Modified: llvm/trunk/lib/DebugInfo/CodeView/EnumTables.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/EnumTables.cpp?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/EnumTables.cpp?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/lib/DebugInfo/CodeView/EnumTables.cpp (original)<br class="">+++ llvm/trunk/lib/DebugInfo/CodeView/EnumTables.cpp Thu Aug 18 11:49:29 2016<br class="">@@ -24,6 +24,12 @@ static const EnumEntry<SymbolKind> Symbo<br class=""> #undef CV_SYMBOL<br class=""> };<br class=""><br class="">+static const EnumEntry<TypeLeafKind> TypeLeafNames[] = {<br class="">+#define CV_TYPE(name, val) {#name, name},<br class="">+#include "llvm/DebugInfo/CodeView/TypeRecords.def"<br class="">+#undef CV_TYPE<br class="">+};<br class="">+<br class=""> static const EnumEntry<uint16_t> RegisterNames[] = {<br class=""> CV_ENUM_CLASS_ENT(RegisterId, Unknown),<br class=""> CV_ENUM_CLASS_ENT(RegisterId, VFrame),<br class="">@@ -324,6 +330,10 @@ ArrayRef<EnumEntry<SymbolKind>> getSymbo<br class=""> return makeArrayRef(SymbolTypeNames);<br class=""> }<br class=""><br class="">+ArrayRef<EnumEntry<TypeLeafKind>> getTypeLeafNames() {<br class="">+ return makeArrayRef(TypeLeafNames);<br class="">+}<br class="">+<br class=""> ArrayRef<EnumEntry<uint16_t>> getRegisterNames() {<br class=""> return makeArrayRef(RegisterNames);<br class=""> }<br class=""><br class="">Modified: llvm/trunk/lib/DebugInfo/CodeView/TypeDeserializer.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/TypeDeserializer.cpp?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/TypeDeserializer.cpp?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/lib/DebugInfo/CodeView/TypeDeserializer.cpp (original)<br class="">+++ llvm/trunk/lib/DebugInfo/CodeView/TypeDeserializer.cpp Thu Aug 18 11:49:29 2016<br class="">@@ -11,71 +11,3 @@<br class=""><br class=""> using namespace llvm;<br class=""> using namespace llvm::codeview;<br class="">-<br class="">-template <typename T><br class="">-static Error takeObject(ArrayRef<uint8_t> &Data, const T *&Res) {<br class="">- if (Data.size() < sizeof(*Res))<br class="">- return llvm::make_error<CodeViewError>(cv_error_code::insufficient_buffer);<br class="">- Res = reinterpret_cast<const T *>(Data.data());<br class="">- Data = Data.drop_front(sizeof(*Res));<br class="">- return Error::success();<br class="">-}<br class="">-<br class="">-Error TypeDeserializer::visitKnownRecord(const CVRecord<TypeLeafKind> &CVR,<br class="">- FieldListRecord &Record) {<br class="">- ArrayRef<uint8_t> FieldListRecordData = CVR.Data;<br class="">- auto ExpectedRecord = FieldListRecord::deserialize(TypeRecordKind::FieldList,<br class="">- FieldListRecordData);<br class="">- if (!ExpectedRecord)<br class="">- return ExpectedRecord.takeError();<br class="">-<br class="">- Record = *ExpectedRecord;<br class="">- ArrayRef<uint8_t> MemberData = Record.getFieldListData();<br class="">-<br class="">- while (!MemberData.empty()) {<br class="">- const ulittle16_t *LeafPtr;<br class="">- if (auto EC = takeObject(MemberData, LeafPtr))<br class="">- return EC;<br class="">- TypeLeafKind Leaf = TypeLeafKind(unsigned(*LeafPtr));<br class="">- switch (Leaf) {<br class="">- default:<br class="">- // Field list records do not describe their own length, so we cannot<br class="">- // continue parsing past a type that we don't know how to deserialize.<br class="">- if (auto EC = Recipient.visitUnknownMember(CVR))<br class="">- return EC;<br class="">- return llvm::make_error<CodeViewError>(<br class="">- cv_error_code::unknown_member_record);<br class="">-#define MEMBER_RECORD(EnumName, EnumVal, Name) \<br class="">- case EnumName: { \<br class="">- TypeRecordKind RK = static_cast<TypeRecordKind>(Leaf); \<br class="">- Name##Record Member(RK); \<br class="">- if (auto EC = visitKnownMember(MemberData, Leaf, Member)) \<br class="">- return EC; \<br class="">- break; \<br class="">- }<br class="">-#define MEMBER_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName) \<br class="">- MEMBER_RECORD(EnumVal, EnumVal, AliasName)<br class="">-#include "llvm/DebugInfo/CodeView/TypeRecords.def"<br class="">- }<br class="">- if (auto EC = skipPadding(MemberData))<br class="">- return EC;<br class="">- }<br class="">- return Error::success();<br class="">-}<br class="">-<br class="">-Error TypeDeserializer::skipPadding(ArrayRef<uint8_t> &Data) {<br class="">- if (Data.empty())<br class="">- return Error::success();<br class="">- uint8_t Leaf = Data.front();<br class="">- if (Leaf < LF_PAD0)<br class="">- return Error::success();<br class="">- // Leaf is greater than 0xf0. We should advance by the number of bytes in<br class="">- // the low 4 bits.<br class="">- unsigned BytesToAdvance = Leaf & 0x0F;<br class="">- if (Data.size() < BytesToAdvance) {<br class="">- return llvm::make_error<CodeViewError>(cv_error_code::corrupt_record,<br class="">- "Invalid padding bytes!");<br class="">- }<br class="">- Data = Data.drop_front(BytesToAdvance);<br class="">- return Error::success();<br class="">-}<br class=""><br class="">Modified: llvm/trunk/lib/DebugInfo/CodeView/TypeDumper.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/TypeDumper.cpp?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/TypeDumper.cpp?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/lib/DebugInfo/CodeView/TypeDumper.cpp (original)<br class="">+++ llvm/trunk/lib/DebugInfo/CodeView/TypeDumper.cpp Thu Aug 18 11:49:29 2016<br class="">@@ -206,21 +206,38 @@ Error CVTypeDumper::visitTypeBegin(const<br class=""> // Reset Name to the empty string. If the visitor sets it, we know it.<br class=""> Name = "";<br class=""><br class="">- W->startLine() << getLeafTypeName(Record.Type) << " ("<br class="">- << HexNumber(getNextTypeIndex()) << ") {\n";<br class="">+ W->startLine() << getLeafTypeName(Record.Type);<br class="">+ if (!IsInFieldList) {<br class="">+ // If this is a field list member, don't record its type index because it<br class="">+ // doesn't have one. Only the outer field list has a type index.<br class="">+ W->getOStream() << " (" << HexNumber(getNextTypeIndex()) << ")";<br class="">+ }<br class="">+ W->getOStream() << " {\n";<br class=""> W->indent();<br class=""> W->printEnum("TypeLeafKind", unsigned(Record.Type),<br class=""> makeArrayRef(LeafTypeNames));<br class="">+ if (Record.Type == LF_FIELDLIST) {<br class="">+ // Record that we're in a field list so that members do not get assigned<br class="">+ // type indices.<br class="">+ assert(!IsInFieldList);<br class="">+ IsInFieldList = true;<br class="">+ }<br class=""> return Error::success();<br class=""> }<br class=""><br class=""> Error CVTypeDumper::visitTypeEnd(const CVRecord<TypeLeafKind> &Record) {<br class="">- if (Record.Type == LF_FIELDLIST)<br class="">- Name = "<field list>";<br class="">+ if (Record.Type == LF_FIELDLIST) {<br class="">+ assert(IsInFieldList);<br class="">+ IsInFieldList = false;<br class="">+ }<br class=""><br class="">- // Always record some name for every type, even if Name is empty. CVUDTNames<br class="">- // is indexed by type index, and must have one entry for every type.<br class="">- recordType(Name);<br class="">+ if (!IsInFieldList) {<br class="">+ // Record every type that is not a field list member, even if Name is empty.<br class="">+ // CVUDTNames is indexed by type index, and must have one entry for every<br class="">+ // type. Field list members are not recorded, and are only referenced by<br class="">+ // their containing field list record.<br class="">+ recordType(Name);<br class="">+ }<br class=""><br class=""> if (PrintRecordBytes)<br class=""> W->printBinaryBlock("LeafData", getBytesAsCharacters(Record.Data));<br class="">@@ -232,6 +249,12 @@ Error CVTypeDumper::visitTypeEnd(const C<br class=""><br class=""> Error CVTypeDumper::visitKnownRecord(const CVRecord<TypeLeafKind> &CVR,<br class=""> FieldListRecord &FieldList) {<br class="">+ TypeDeserializer Deserializer(*this);<br class="">+ CVTypeVisitor Visitor(Deserializer);<br class="">+ if (auto EC = Visitor.visitFieldListMemberStream(FieldList.Data))<br class="">+ return EC;<br class="">+<br class="">+ Name = "<field list>";<br class=""> return Error::success();<br class=""> }<br class=""><br class="">@@ -550,7 +573,6 @@ Error CVTypeDumper::visitUnknownMember(c<br class=""> }<br class=""><br class=""> Error CVTypeDumper::visitUnknownType(const CVRecord<TypeLeafKind> &Record) {<br class="">- DictScope S(*W, "UnknownType");<br class=""> W->printEnum("Kind", uint16_t(Record.Type), makeArrayRef(LeafTypeNames));<br class=""> W->printNumber("Length", uint32_t(Record.Data.size()));<br class=""> return Error::success();<br class="">@@ -558,7 +580,6 @@ Error CVTypeDumper::visitUnknownType(con<br class=""><br class=""> Error CVTypeDumper::visitKnownRecord(const CVRecord<TypeLeafKind> &CVR,<br class=""> NestedTypeRecord &Nested) {<br class="">- DictScope S(*W, "NestedType");<br class=""> printTypeIndex("Type", Nested.getNestedType());<br class=""> W->printString("Name", Nested.getName());<br class=""> Name = Nested.getName();<br class="">@@ -567,7 +588,6 @@ Error CVTypeDumper::visitKnownRecord(con<br class=""><br class=""> Error CVTypeDumper::visitKnownRecord(const CVRecord<TypeLeafKind> &CVR,<br class=""> OneMethodRecord &Method) {<br class="">- DictScope S(*W, "OneMethod");<br class=""> MethodKind K = Method.getKind();<br class=""> printMemberAttributes(Method.getAccess(), K, Method.getOptions());<br class=""> printTypeIndex("Type", Method.getType());<br class="">@@ -581,7 +601,6 @@ Error CVTypeDumper::visitKnownRecord(con<br class=""><br class=""> Error CVTypeDumper::visitKnownRecord(const CVRecord<TypeLeafKind> &CVR,<br class=""> OverloadedMethodRecord &Method) {<br class="">- DictScope S(*W, "OverloadedMethod");<br class=""> W->printHex("MethodCount", Method.getNumOverloads());<br class=""> printTypeIndex("MethodListIndex", Method.getMethodList());<br class=""> W->printString("Name", Method.getName());<br class="">@@ -591,7 +610,6 @@ Error CVTypeDumper::visitKnownRecord(con<br class=""><br class=""> Error CVTypeDumper::visitKnownRecord(const CVRecord<TypeLeafKind> &CVR,<br class=""> DataMemberRecord &Field) {<br class="">- DictScope S(*W, "DataMember");<br class=""> printMemberAttributes(Field.getAccess(), MethodKind::Vanilla,<br class=""> MethodOptions::None);<br class=""> printTypeIndex("Type", Field.getType());<br class="">@@ -603,7 +621,6 @@ Error CVTypeDumper::visitKnownRecord(con<br class=""><br class=""> Error CVTypeDumper::visitKnownRecord(const CVRecord<TypeLeafKind> &CVR,<br class=""> StaticDataMemberRecord &Field) {<br class="">- DictScope S(*W, "StaticDataMember");<br class=""> printMemberAttributes(Field.getAccess(), MethodKind::Vanilla,<br class=""> MethodOptions::None);<br class=""> printTypeIndex("Type", Field.getType());<br class="">@@ -614,14 +631,12 @@ Error CVTypeDumper::visitKnownRecord(con<br class=""><br class=""> Error CVTypeDumper::visitKnownRecord(const CVRecord<TypeLeafKind> &CVR,<br class=""> VFPtrRecord &VFTable) {<br class="">- DictScope S(*W, "VFPtr");<br class=""> printTypeIndex("Type", VFTable.getType());<br class=""> return Error::success();<br class=""> }<br class=""><br class=""> Error CVTypeDumper::visitKnownRecord(const CVRecord<TypeLeafKind> &CVR,<br class=""> EnumeratorRecord &Enum) {<br class="">- DictScope S(*W, "Enumerator");<br class=""> printMemberAttributes(Enum.getAccess(), MethodKind::Vanilla,<br class=""> MethodOptions::None);<br class=""> W->printNumber("EnumValue", Enum.getValue());<br class="">@@ -632,7 +647,6 @@ Error CVTypeDumper::visitKnownRecord(con<br class=""><br class=""> Error CVTypeDumper::visitKnownRecord(const CVRecord<TypeLeafKind> &CVR,<br class=""> BaseClassRecord &Base) {<br class="">- DictScope S(*W, "BaseClass");<br class=""> printMemberAttributes(Base.getAccess(), MethodKind::Vanilla,<br class=""> MethodOptions::None);<br class=""> printTypeIndex("BaseType", Base.getBaseType());<br class="">@@ -642,7 +656,6 @@ Error CVTypeDumper::visitKnownRecord(con<br class=""><br class=""> Error CVTypeDumper::visitKnownRecord(const CVRecord<TypeLeafKind> &CVR,<br class=""> VirtualBaseClassRecord &Base) {<br class="">- DictScope S(*W, "VirtualBaseClass");<br class=""> printMemberAttributes(Base.getAccess(), MethodKind::Vanilla,<br class=""> MethodOptions::None);<br class=""> printTypeIndex("BaseType", Base.getBaseType());<br class="">@@ -654,7 +667,6 @@ Error CVTypeDumper::visitKnownRecord(con<br class=""><br class=""> Error CVTypeDumper::visitKnownRecord(const CVRecord<TypeLeafKind> &CVR,<br class=""> ListContinuationRecord &Cont) {<br class="">- DictScope S(*W, "ListContinuation");<br class=""> printTypeIndex("ContinuationIndex", Cont.getContinuationIndex());<br class=""> return Error::success();<br class=""> }<br class=""><br class="">Modified: llvm/trunk/lib/DebugInfo/CodeView/TypeRecord.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/TypeRecord.cpp?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/TypeRecord.cpp?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/lib/DebugInfo/CodeView/TypeRecord.cpp (original)<br class="">+++ llvm/trunk/lib/DebugInfo/CodeView/TypeRecord.cpp Thu Aug 18 11:49:29 2016<br class="">@@ -8,8 +8,9 @@<br class=""> //===----------------------------------------------------------------------===//<br class=""><br class=""> #include "llvm/DebugInfo/CodeView/TypeRecord.h"<br class="">-#include "llvm/DebugInfo/CodeView/TypeIndex.h"<br class=""> #include "llvm/DebugInfo/CodeView/RecordSerialization.h"<br class="">+#include "llvm/DebugInfo/CodeView/TypeIndex.h"<br class="">+#include "llvm/DebugInfo/MSF/ByteStream.h"<br class=""><br class=""> using namespace llvm;<br class=""> using namespace llvm::codeview;<br class="">@@ -116,7 +117,9 @@ NestedTypeRecord::deserialize(TypeRecord<br class=""><br class=""> Expected<FieldListRecord><br class=""> FieldListRecord::deserialize(TypeRecordKind Kind, ArrayRef<uint8_t> &Data) {<br class="">- return FieldListRecord(Data);<br class="">+ auto FieldListData = Data;<br class="">+ Data = ArrayRef<uint8_t>();<br class="">+ return FieldListRecord(FieldListData);<br class=""> }<br class=""><br class=""> Expected<ArrayRecord> ArrayRecord::deserialize(TypeRecordKind Kind,<br class="">@@ -448,7 +451,7 @@ bool PointerRecord::remapTypeIndices(Arr<br class=""> bool Success = true;<br class=""> Success &= remapIndex(IndexMap, ReferentType);<br class=""> if (isPointerToMember())<br class="">- Success &= MemberInfo.remapTypeIndices(IndexMap);<br class="">+ Success &= MemberInfo->remapTypeIndices(IndexMap);<br class=""> return Success;<br class=""> }<br class=""><br class=""><br class="">Modified: llvm/trunk/lib/DebugInfo/CodeView/TypeStreamMerger.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/TypeStreamMerger.cpp?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/TypeStreamMerger.cpp?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/lib/DebugInfo/CodeView/TypeStreamMerger.cpp (original)<br class="">+++ llvm/trunk/lib/DebugInfo/CodeView/TypeStreamMerger.cpp Thu Aug 18 11:49:29 2016<br class="">@@ -84,6 +84,11 @@ private:<br class=""><br class=""> Error visitKnownRecordImpl(FieldListRecord &Record) {<br class=""> // Don't do anything, this will get written in the call to visitTypeEnd().<br class="">+ TypeDeserializer Deserializer(*this);<br class="">+ CVTypeVisitor Visitor(Deserializer);<br class="">+<br class="">+ if (auto EC = Visitor.visitFieldListMemberStream(Record.Data))<br class="">+ return std::move(EC);<br class=""> return Error::success();<br class=""> }<br class=""><br class="">@@ -102,6 +107,7 @@ private:<br class=""><br class=""> TypeTableBuilder &DestStream;<br class=""><br class="">+ bool IsInFieldList{false};<br class=""> size_t BeginIndexMapSize = 0;<br class=""><br class=""> /// Map from source type index to destination type index. Indexed by source<br class="">@@ -112,7 +118,10 @@ private:<br class=""> } // end anonymous namespace<br class=""><br class=""> Error TypeStreamMerger::visitTypeBegin(const CVRecord<TypeLeafKind> &Rec) {<br class="">- if (Rec.Type != TypeLeafKind::LF_FIELDLIST)<br class="">+ if (Rec.Type == TypeLeafKind::LF_FIELDLIST) {<br class="">+ assert(!IsInFieldList);<br class="">+ IsInFieldList = true;<br class="">+ } else<br class=""> BeginIndexMapSize = IndexMap.size();<br class=""> return Error::success();<br class=""> }<br class="">@@ -121,7 +130,8 @@ Error TypeStreamMerger::visitTypeEnd(con<br class=""> if (Rec.Type == TypeLeafKind::LF_FIELDLIST) {<br class=""> IndexMap.push_back(DestStream.writeFieldList(FieldBuilder));<br class=""> FieldBuilder.reset();<br class="">- } else {<br class="">+ IsInFieldList = false;<br class="">+ } else if (!IsInFieldList) {<br class=""> assert(IndexMap.size() == BeginIndexMapSize + 1);<br class=""> }<br class=""> return Error::success();<br class=""><br class="">Modified: llvm/trunk/test/DebugInfo/COFF/big-type.ll<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/big-type.ll?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/big-type.ll?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/test/DebugInfo/COFF/big-type.ll (original)<br class="">+++ llvm/trunk/test/DebugInfo/COFF/big-type.ll Thu Aug 18 11:49:29 2016<br class="">@@ -5,6 +5,7 @@<br class=""> ; CHECK-LABEL: FieldList (0x1000)<br class=""> ; CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203)<br class=""> ; CHECK-NEXT: Enumerator {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ENUMERATE (0x1502)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: EnumValue: 5460<br class=""> ; CHECK-NEXT: Name: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE5461<br class="">@@ -14,6 +15,7 @@<br class=""> ; CHECK-LABEL: FieldList (0x1001)<br class=""> ; CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203)<br class=""> ; CHECK-NEXT: Enumerator {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ENUMERATE (0x1502)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: EnumValue: 4095<br class=""> ; CHECK-NEXT: Name: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE4096<br class="">@@ -23,6 +25,7 @@<br class=""> ; CHECK-LABEL: FieldList (0x1002)<br class=""> ; CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203)<br class=""> ; CHECK-NEXT: Enumerator {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ENUMERATE (0x1502)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: EnumValue: 2730<br class=""> ; CHECK-NEXT: Name: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE2731<br class="">@@ -32,6 +35,7 @@<br class=""> ; CHECK-LABEL: FieldList (0x1003)<br class=""> ; CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203)<br class=""> ; CHECK-NEXT: Enumerator {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ENUMERATE (0x1502)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: EnumValue: 1365<br class=""> ; CHECK-NEXT: Name: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE1366<br class="">@@ -41,6 +45,7 @@<br class=""> ; CHECK-LABEL: FieldList (0x1004)<br class=""> ; CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203)<br class=""> ; CHECK-NEXT: Enumerator {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ENUMERATE (0x1502)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: EnumValue: 0<br class=""> ; CHECK-NEXT: Name: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE1<br class=""><br class="">Modified: llvm/trunk/test/DebugInfo/COFF/enum.ll<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/enum.ll?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/enum.ll?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/test/DebugInfo/COFF/enum.ll (original)<br class="">+++ llvm/trunk/test/DebugInfo/COFF/enum.ll Thu Aug 18 11:49:29 2016<br class="">@@ -8,6 +8,7 @@<br class=""> ; CHECK: FieldList (0x1000) {<br class=""> ; CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203)<br class=""> ; CHECK-NEXT: Enumerator {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ENUMERATE (0x1502)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: EnumValue: 0<br class=""> ; CHECK-NEXT: Name: BLAH<br class=""><br class="">Modified: llvm/trunk/test/DebugInfo/COFF/inheritance.ll<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/inheritance.ll?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/inheritance.ll?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/test/DebugInfo/COFF/inheritance.ll (original)<br class="">+++ llvm/trunk/test/DebugInfo/COFF/inheritance.ll Thu Aug 18 11:49:29 2016<br class="">@@ -16,11 +16,13 @@<br class=""> ; CHECK: FieldList ({{.*}}) {<br class=""> ; CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203)<br class=""> ; CHECK-NEXT: BaseClass {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_BCLASS (0x1400)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: BaseType: B ({{.*}})<br class=""> ; CHECK-NEXT: BaseOffset: 0x8<br class=""> ; CHECK-NEXT: }<br class=""> ; CHECK-NEXT: BaseClass {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_BCLASS (0x1400)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: BaseType: C ({{.*}})<br class=""> ; CHECK-NEXT: BaseOffset: 0x18<br class="">@@ -31,6 +33,7 @@<br class=""> ; CHECK: FieldList ({{.*}}) {<br class=""> ; CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203)<br class=""> ; CHECK-NEXT: VirtualBaseClass {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_VBCLASS (0x1401)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: BaseType: A ({{.*}})<br class=""> ; CHECK-NEXT: VBPtrType: const int* ({{.*}})<br class="">@@ -43,6 +46,7 @@<br class=""> ; CHECK: FieldList ({{.*}}) {<br class=""> ; CHECK-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203)<br class=""> ; CHECK-NEXT: VirtualBaseClass {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_VBCLASS (0x1401)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: BaseType: A ({{.*}})<br class=""> ; CHECK-NEXT: VBPtrType: const int* ({{.*}})<br class=""><br class="">Modified: llvm/trunk/test/DebugInfo/COFF/virtual-method-kinds.ll<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/virtual-method-kinds.ll?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/virtual-method-kinds.ll?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/test/DebugInfo/COFF/virtual-method-kinds.ll (original)<br class="">+++ llvm/trunk/test/DebugInfo/COFF/virtual-method-kinds.ll Thu Aug 18 11:49:29 2016<br class="">@@ -20,12 +20,14 @@<br class=""> ; $ clang t.cpp -S -emit-llvm -g -gcodeview -o t.ll<br class=""><br class=""> ; CHECK: OneMethod {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ONEMETHOD (0x1511)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: MethodKind: Virtual (0x1)<br class=""> ; CHECK-NEXT: Type: void C::() ({{.*}})<br class=""> ; CHECK-NEXT: Name: f<br class=""> ; CHECK-NEXT: }<br class=""> ; CHECK-NEXT: OneMethod {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ONEMETHOD (0x1511)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: MethodKind: Virtual (0x1)<br class=""> ; CHECK-NEXT: Type: void C::() ({{.*}})<br class="">@@ -33,12 +35,14 @@<br class=""> ; CHECK-NEXT: }<br class=""><br class=""> ; CHECK: OneMethod {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ONEMETHOD (0x1511)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: MethodKind: PureVirtual (0x5)<br class=""> ; CHECK-NEXT: Type: void B::() ({{.*}})<br class=""> ; CHECK-NEXT: Name: f<br class=""> ; CHECK-NEXT: }<br class=""> ; CHECK-NEXT: OneMethod {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ONEMETHOD (0x1511)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: MethodKind: Virtual (0x1)<br class=""> ; CHECK-NEXT: Type: void B::() ({{.*}})<br class="">@@ -46,6 +50,7 @@<br class=""> ; CHECK-NEXT: }<br class=""><br class=""> ; CHECK: OneMethod {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ONEMETHOD (0x1511)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: MethodKind: IntroducingVirtual (0x4)<br class=""> ; CHECK-NEXT: Type: void A::() ({{.*}})<br class="">@@ -53,6 +58,7 @@<br class=""> ; CHECK-NEXT: Name: f<br class=""> ; CHECK-NEXT: }<br class=""> ; CHECK-NEXT: OneMethod {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ONEMETHOD (0x1511)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: MethodKind: PureIntroducingVirtual (0x6)<br class=""> ; CHECK-NEXT: Type: void A::() ({{.*}})<br class=""><br class="">Modified: llvm/trunk/test/DebugInfo/COFF/virtual-methods.ll<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/virtual-methods.ll?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/COFF/virtual-methods.ll?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/test/DebugInfo/COFF/virtual-methods.ll (original)<br class="">+++ llvm/trunk/test/DebugInfo/COFF/virtual-methods.ll Thu Aug 18 11:49:29 2016<br class="">@@ -64,6 +64,7 @@<br class=""><br class=""> ; CHECK: FieldList ({{.*}}) {<br class=""> ; CHECK: OneMethod {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ONEMETHOD (0x1511)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: MethodKind: Virtual (0x1)<br class=""> ; CHECK-NEXT: Type: int C::() ([[C_g]])<br class="">@@ -87,6 +88,7 @@<br class=""><br class=""> ; CHECK: FieldList ({{.*}}) {<br class=""> ; CHECK: OneMethod {<br class="">+; CHECK-NEXT: TypeLeafKind: LF_ONEMETHOD (0x1511)<br class=""> ; CHECK-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; CHECK-NEXT: MethodKind: Virtual (0x1)<br class=""> ; CHECK-NEXT: Type: int D::() ([[D_g]])<br class=""><br class="">Modified: llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test (original)<br class="">+++ llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test Thu Aug 18 11:49:29 2016<br class="">@@ -111,26 +111,31 @@<br class=""> ; EMPTY-NEXT: FieldList (0x1002) {<br class=""> ; EMPTY-NEXT: TypeLeafKind: LF_FIELDLIST (0x1203)<br class=""> ; EMPTY-NEXT: Enumerator {<br class="">+; EMPTY-NEXT: TypeLeafKind: LF_ENUMERATE (0x1502)<br class=""> ; EMPTY-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; EMPTY-NEXT: EnumValue: 1<br class=""> ; EMPTY-NEXT: Name: apartment<br class=""> ; EMPTY-NEXT: }<br class=""> ; EMPTY-NEXT: Enumerator {<br class="">+; EMPTY-NEXT: TypeLeafKind: LF_ENUMERATE (0x1502)<br class=""> ; EMPTY-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; EMPTY-NEXT: EnumValue: 2<br class=""> ; EMPTY-NEXT: Name: single<br class=""> ; EMPTY-NEXT: }<br class=""> ; EMPTY-NEXT: Enumerator {<br class="">+; EMPTY-NEXT: TypeLeafKind: LF_ENUMERATE (0x1502)<br class=""> ; EMPTY-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; EMPTY-NEXT: EnumValue: 3<br class=""> ; EMPTY-NEXT: Name: free<br class=""> ; EMPTY-NEXT: }<br class=""> ; EMPTY-NEXT: Enumerator {<br class="">+; EMPTY-NEXT: TypeLeafKind: LF_ENUMERATE (0x1502)<br class=""> ; EMPTY-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; EMPTY-NEXT: EnumValue: 4<br class=""> ; EMPTY-NEXT: Name: neutral<br class=""> ; EMPTY-NEXT: }<br class=""> ; EMPTY-NEXT: Enumerator {<br class="">+; EMPTY-NEXT: TypeLeafKind: LF_ENUMERATE (0x1502)<br class=""> ; EMPTY-NEXT: AccessSpecifier: Public (0x3)<br class=""> ; EMPTY-NEXT: EnumValue: 5<br class=""> ; EMPTY-NEXT: Name: both<br class=""><br class="">Added: llvm/trunk/test/DebugInfo/PDB/pdbdump-yaml-types.test<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/PDB/pdbdump-yaml-types.test?rev=279089&view=auto" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/PDB/pdbdump-yaml-types.test?rev=279089&view=auto</a><br class="">==============================================================================<br class="">--- llvm/trunk/test/DebugInfo/PDB/pdbdump-yaml-types.test (added)<br class="">+++ llvm/trunk/test/DebugInfo/PDB/pdbdump-yaml-types.test Thu Aug 18 11:49:29 2016<br class="">@@ -0,0 +1,1087 @@<br class="">+; RUN: llvm-pdbdump pdb2yaml -tpi-stream %p/Inputs/empty.pdb \<br class="">+; RUN: | FileCheck -check-prefix=YAML %s<br class="">+<br class="">+YAML: ---<br class="">+YAML: MSF: <br class="">+YAML: SuperBlock: <br class="">+YAML: BlockSize: 4096<br class="">+YAML: FreeBlockMap: 2<br class="">+YAML: NumBlocks: 25<br class="">+YAML: NumDirectoryBytes: 136<br class="">+YAML: Unknown1: 0<br class="">+YAML: BlockMapAddr: 24<br class="">+YAML: NumDirectoryBlocks: 1<br class="">+YAML: DirectoryBlocks: [ 23 ]<br class="">+YAML: NumStreams: 0<br class="">+YAML: FileSize: 102400<br class="">+YAML: TpiStream: <br class="">+YAML: Version: VC80<br class="">+YAML: Records: <br class="">+YAML: - Kind: LF_ARGLIST<br class="">+YAML: ArgList: <br class="">+YAML: ArgIndices: [ ]<br class="">+YAML: - Kind: LF_PROCEDURE<br class="">+YAML: Procedure: <br class="">+YAML: ReturnType: 116<br class="">+YAML: CallConv: NearC<br class="">+YAML: Options: [ None ]<br class="">+YAML: ParameterCount: 0<br class="">+YAML: ArgumentList: 4096<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 1<br class="">+YAML: Name: apartment<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 2<br class="">+YAML: Name: single<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 3<br class="">+YAML: Name: free<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 4<br class="">+YAML: Name: neutral<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 5<br class="">+YAML: Name: both<br class="">+YAML: - Kind: LF_ENUM<br class="">+YAML: Enum: <br class="">+YAML: NumEnumerators: 5<br class="">+YAML: Options: [ None, Nested, HasUniqueName ]<br class="">+YAML: FieldList: 4098<br class="">+YAML: Name: '__vc_attributes::threadingAttribute::threading_e'<br class="">+YAML: UniqueName: '.?AW4threading_e@threadingAttribute@__vc_attributes@@'<br class="">+YAML: UnderlyingType: 116<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 0<br class="">+YAML: Options: [ None, ForwardReference, HasUniqueName ]<br class="">+YAML: FieldList: 0<br class="">+YAML: Name: '__vc_attributes::threadingAttribute'<br class="">+YAML: UniqueName: '.?AUthreadingAttribute@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 0<br class="">+YAML: - Kind: LF_POINTER<br class="">+YAML: Pointer: <br class="">+YAML: ReferentType: 4100<br class="">+YAML: PtrKind: Near32<br class="">+YAML: Mode: Pointer<br class="">+YAML: Options: [ None, Const ]<br class="">+YAML: Size: 4<br class="">+YAML: - Kind: LF_ARGLIST<br class="">+YAML: ArgList: <br class="">+YAML: ArgIndices: [ 4099 ]<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4100<br class="">+YAML: ThisType: 4101<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 1<br class="">+YAML: ArgumentList: 4102<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4100<br class="">+YAML: ThisType: 4101<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 0<br class="">+YAML: ArgumentList: 4096<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_METHODLIST<br class="">+YAML: MethodOverloadList: <br class="">+YAML: Methods: <br class="">+YAML: - Type: 4103<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: ''<br class="">+YAML: - Type: 4104<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: ''<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_NESTTYPE<br class="">+YAML: NestedType: <br class="">+YAML: Type: 4099<br class="">+YAML: Name: threading_e<br class="">+YAML: Kind: LF_METHOD<br class="">+YAML: OverloadedMethod: <br class="">+YAML: NumOverloads: 2<br class="">+YAML: MethodList: 4105<br class="">+YAML: Name: threadingAttribute<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4099<br class="">+YAML: FieldOffset: 0<br class="">+YAML: Name: value<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 4<br class="">+YAML: Options: [ None, HasConstructorOrDestructor, ContainsNestedClass, HasUniqueName ]<br class="">+YAML: FieldList: 4106<br class="">+YAML: Name: '__vc_attributes::threadingAttribute'<br class="">+YAML: UniqueName: '.?AUthreadingAttribute@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 4<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 0<br class="">+YAML: Name: native<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 1<br class="">+YAML: Name: com<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 2<br class="">+YAML: Name: managed<br class="">+YAML: - Kind: LF_ENUM<br class="">+YAML: Enum: <br class="">+YAML: NumEnumerators: 3<br class="">+YAML: Options: [ None, Nested, HasUniqueName ]<br class="">+YAML: FieldList: 4108<br class="">+YAML: Name: '__vc_attributes::event_receiverAttribute::type_e'<br class="">+YAML: UniqueName: '.?AW4type_e@event_receiverAttribute@__vc_attributes@@'<br class="">+YAML: UnderlyingType: 116<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 0<br class="">+YAML: Options: [ None, ForwardReference, HasUniqueName ]<br class="">+YAML: FieldList: 0<br class="">+YAML: Name: '__vc_attributes::event_receiverAttribute'<br class="">+YAML: UniqueName: '.?AUevent_receiverAttribute@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 0<br class="">+YAML: - Kind: LF_POINTER<br class="">+YAML: Pointer: <br class="">+YAML: ReferentType: 4110<br class="">+YAML: PtrKind: Near32<br class="">+YAML: Mode: Pointer<br class="">+YAML: Options: [ None, Const ]<br class="">+YAML: Size: 4<br class="">+YAML: - Kind: LF_ARGLIST<br class="">+YAML: ArgList: <br class="">+YAML: ArgIndices: [ 4109, 48 ]<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4110<br class="">+YAML: ThisType: 4111<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 2<br class="">+YAML: ArgumentList: 4112<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_ARGLIST<br class="">+YAML: ArgList: <br class="">+YAML: ArgIndices: [ 4109 ]<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4110<br class="">+YAML: ThisType: 4111<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 1<br class="">+YAML: ArgumentList: 4114<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4110<br class="">+YAML: ThisType: 4111<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 0<br class="">+YAML: ArgumentList: 4096<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_METHODLIST<br class="">+YAML: MethodOverloadList: <br class="">+YAML: Methods: <br class="">+YAML: - Type: 4113<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: ''<br class="">+YAML: - Type: 4115<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: ''<br class="">+YAML: - Type: 4116<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: ''<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_NESTTYPE<br class="">+YAML: NestedType: <br class="">+YAML: Type: 4109<br class="">+YAML: Name: type_e<br class="">+YAML: Kind: LF_METHOD<br class="">+YAML: OverloadedMethod: <br class="">+YAML: NumOverloads: 3<br class="">+YAML: MethodList: 4117<br class="">+YAML: Name: event_receiverAttribute<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4109<br class="">+YAML: FieldOffset: 0<br class="">+YAML: Name: type<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 48<br class="">+YAML: FieldOffset: 4<br class="">+YAML: Name: layout_dependent<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 6<br class="">+YAML: Options: [ None, HasConstructorOrDestructor, ContainsNestedClass, HasUniqueName ]<br class="">+YAML: FieldList: 4118<br class="">+YAML: Name: '__vc_attributes::event_receiverAttribute'<br class="">+YAML: UniqueName: '.?AUevent_receiverAttribute@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 8<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 0<br class="">+YAML: Name: never<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 1<br class="">+YAML: Name: allowed<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 2<br class="">+YAML: Name: always<br class="">+YAML: - Kind: LF_ENUM<br class="">+YAML: Enum: <br class="">+YAML: NumEnumerators: 3<br class="">+YAML: Options: [ None, Nested, HasUniqueName ]<br class="">+YAML: FieldList: 4120<br class="">+YAML: Name: '__vc_attributes::aggregatableAttribute::type_e'<br class="">+YAML: UniqueName: '.?AW4type_e@aggregatableAttribute@__vc_attributes@@'<br class="">+YAML: UnderlyingType: 116<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 0<br class="">+YAML: Options: [ None, ForwardReference, HasUniqueName ]<br class="">+YAML: FieldList: 0<br class="">+YAML: Name: '__vc_attributes::aggregatableAttribute'<br class="">+YAML: UniqueName: '.?AUaggregatableAttribute@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 0<br class="">+YAML: - Kind: LF_POINTER<br class="">+YAML: Pointer: <br class="">+YAML: ReferentType: 4122<br class="">+YAML: PtrKind: Near32<br class="">+YAML: Mode: Pointer<br class="">+YAML: Options: [ None, Const ]<br class="">+YAML: Size: 4<br class="">+YAML: - Kind: LF_ARGLIST<br class="">+YAML: ArgList: <br class="">+YAML: ArgIndices: [ 4121 ]<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4122<br class="">+YAML: ThisType: 4123<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 1<br class="">+YAML: ArgumentList: 4124<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4122<br class="">+YAML: ThisType: 4123<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 0<br class="">+YAML: ArgumentList: 4096<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_METHODLIST<br class="">+YAML: MethodOverloadList: <br class="">+YAML: Methods: <br class="">+YAML: - Type: 4125<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: ''<br class="">+YAML: - Type: 4126<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: ''<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_NESTTYPE<br class="">+YAML: NestedType: <br class="">+YAML: Type: 4121<br class="">+YAML: Name: type_e<br class="">+YAML: Kind: LF_METHOD<br class="">+YAML: OverloadedMethod: <br class="">+YAML: NumOverloads: 2<br class="">+YAML: MethodList: 4127<br class="">+YAML: Name: aggregatableAttribute<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4121<br class="">+YAML: FieldOffset: 0<br class="">+YAML: Name: type<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 4<br class="">+YAML: Options: [ None, HasConstructorOrDestructor, ContainsNestedClass, HasUniqueName ]<br class="">+YAML: FieldList: 4128<br class="">+YAML: Name: '__vc_attributes::aggregatableAttribute'<br class="">+YAML: UniqueName: '.?AUaggregatableAttribute@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 4<br class="">+YAML: - Kind: LF_ENUM<br class="">+YAML: Enum: <br class="">+YAML: NumEnumerators: 3<br class="">+YAML: Options: [ None, Nested, HasUniqueName ]<br class="">+YAML: FieldList: 4108<br class="">+YAML: Name: '__vc_attributes::event_sourceAttribute::type_e'<br class="">+YAML: UniqueName: '.?AW4type_e@event_sourceAttribute@__vc_attributes@@'<br class="">+YAML: UnderlyingType: 116<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 0<br class="">+YAML: Name: speed<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 1<br class="">+YAML: Name: size<br class="">+YAML: - Kind: LF_ENUM<br class="">+YAML: Enum: <br class="">+YAML: NumEnumerators: 2<br class="">+YAML: Options: [ None, Nested, HasUniqueName ]<br class="">+YAML: FieldList: 4131<br class="">+YAML: Name: '__vc_attributes::event_sourceAttribute::optimize_e'<br class="">+YAML: UniqueName: '.?AW4optimize_e@event_sourceAttribute@__vc_attributes@@'<br class="">+YAML: UnderlyingType: 116<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 0<br class="">+YAML: Options: [ None, ForwardReference, HasUniqueName ]<br class="">+YAML: FieldList: 0<br class="">+YAML: Name: '__vc_attributes::event_sourceAttribute'<br class="">+YAML: UniqueName: '.?AUevent_sourceAttribute@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 0<br class="">+YAML: - Kind: LF_POINTER<br class="">+YAML: Pointer: <br class="">+YAML: ReferentType: 4133<br class="">+YAML: PtrKind: Near32<br class="">+YAML: Mode: Pointer<br class="">+YAML: Options: [ None, Const ]<br class="">+YAML: Size: 4<br class="">+YAML: - Kind: LF_ARGLIST<br class="">+YAML: ArgList: <br class="">+YAML: ArgIndices: [ 4130 ]<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4133<br class="">+YAML: ThisType: 4134<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 1<br class="">+YAML: ArgumentList: 4135<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4133<br class="">+YAML: ThisType: 4134<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 0<br class="">+YAML: ArgumentList: 4096<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_METHODLIST<br class="">+YAML: MethodOverloadList: <br class="">+YAML: Methods: <br class="">+YAML: - Type: 4136<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: ''<br class="">+YAML: - Type: 4137<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: ''<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_NESTTYPE<br class="">+YAML: NestedType: <br class="">+YAML: Type: 4130<br class="">+YAML: Name: type_e<br class="">+YAML: Kind: LF_NESTTYPE<br class="">+YAML: NestedType: <br class="">+YAML: Type: 4132<br class="">+YAML: Name: optimize_e<br class="">+YAML: Kind: LF_METHOD<br class="">+YAML: OverloadedMethod: <br class="">+YAML: NumOverloads: 2<br class="">+YAML: MethodList: 4138<br class="">+YAML: Name: event_sourceAttribute<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4130<br class="">+YAML: FieldOffset: 0<br class="">+YAML: Name: type<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4132<br class="">+YAML: FieldOffset: 4<br class="">+YAML: Name: optimize<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 48<br class="">+YAML: FieldOffset: 8<br class="">+YAML: Name: decorate<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 7<br class="">+YAML: Options: [ None, HasConstructorOrDestructor, ContainsNestedClass, HasUniqueName ]<br class="">+YAML: FieldList: 4139<br class="">+YAML: Name: '__vc_attributes::event_sourceAttribute'<br class="">+YAML: UniqueName: '.?AUevent_sourceAttribute@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 12<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 1<br class="">+YAML: Name: dll<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 2<br class="">+YAML: Name: exe<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 3<br class="">+YAML: Name: service<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 4<br class="">+YAML: Name: unspecified<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 2<br class="">+YAML: Name: EXE<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 3<br class="">+YAML: Name: SERVICE<br class="">+YAML: - Kind: LF_ENUM<br class="">+YAML: Enum: <br class="">+YAML: NumEnumerators: 6<br class="">+YAML: Options: [ None, Nested, HasUniqueName ]<br class="">+YAML: FieldList: 4141<br class="">+YAML: Name: '__vc_attributes::moduleAttribute::type_e'<br class="">+YAML: UniqueName: '.?AW4type_e@moduleAttribute@__vc_attributes@@'<br class="">+YAML: UnderlyingType: 116<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 0<br class="">+YAML: Options: [ None, ForwardReference, HasUniqueName ]<br class="">+YAML: FieldList: 0<br class="">+YAML: Name: '__vc_attributes::moduleAttribute'<br class="">+YAML: UniqueName: '.?AUmoduleAttribute@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 0<br class="">+YAML: - Kind: LF_POINTER<br class="">+YAML: Pointer: <br class="">+YAML: ReferentType: 4143<br class="">+YAML: PtrKind: Near32<br class="">+YAML: Mode: Pointer<br class="">+YAML: Options: [ None, Const ]<br class="">+YAML: Size: 4<br class="">+YAML: - Kind: LF_MODIFIER<br class="">+YAML: Modifier: <br class="">+YAML: ModifiedType: 112<br class="">+YAML: Modifiers: [ None, Const ]<br class="">+YAML: - Kind: LF_POINTER<br class="">+YAML: Pointer: <br class="">+YAML: ReferentType: 4145<br class="">+YAML: PtrKind: Near32<br class="">+YAML: Mode: Pointer<br class="">+YAML: Options: [ None ]<br class="">+YAML: Size: 4<br class="">+YAML: - Kind: LF_ARGLIST<br class="">+YAML: ArgList: <br class="">+YAML: ArgIndices: [ 4142, 4146, 4146, 4146, 116, 48, 4146, 116, <br class="">+YAML: 4146, 4146, 116, 48, 48, 4146, 4146 ]<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4143<br class="">+YAML: ThisType: 4144<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 15<br class="">+YAML: ArgumentList: 4147<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_ARGLIST<br class="">+YAML: ArgList: <br class="">+YAML: ArgIndices: [ 4142 ]<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4143<br class="">+YAML: ThisType: 4144<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 1<br class="">+YAML: ArgumentList: 4149<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4143<br class="">+YAML: ThisType: 4144<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 0<br class="">+YAML: ArgumentList: 4096<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_METHODLIST<br class="">+YAML: MethodOverloadList: <br class="">+YAML: Methods: <br class="">+YAML: - Type: 4148<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: ''<br class="">+YAML: - Type: 4150<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: ''<br class="">+YAML: - Type: 4151<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: ''<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_NESTTYPE<br class="">+YAML: NestedType: <br class="">+YAML: Type: 4142<br class="">+YAML: Name: type_e<br class="">+YAML: Kind: LF_METHOD<br class="">+YAML: OverloadedMethod: <br class="">+YAML: NumOverloads: 3<br class="">+YAML: MethodList: 4152<br class="">+YAML: Name: moduleAttribute<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4142<br class="">+YAML: FieldOffset: 0<br class="">+YAML: Name: type<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4146<br class="">+YAML: FieldOffset: 4<br class="">+YAML: Name: name<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4146<br class="">+YAML: FieldOffset: 8<br class="">+YAML: Name: version<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4146<br class="">+YAML: FieldOffset: 12<br class="">+YAML: Name: uuid<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 116<br class="">+YAML: FieldOffset: 16<br class="">+YAML: Name: lcid<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 48<br class="">+YAML: FieldOffset: 20<br class="">+YAML: Name: control<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4146<br class="">+YAML: FieldOffset: 24<br class="">+YAML: Name: helpstring<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 116<br class="">+YAML: FieldOffset: 28<br class="">+YAML: Name: helpstringcontext<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4146<br class="">+YAML: FieldOffset: 32<br class="">+YAML: Name: helpstringdll<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4146<br class="">+YAML: FieldOffset: 36<br class="">+YAML: Name: helpfile<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 116<br class="">+YAML: FieldOffset: 40<br class="">+YAML: Name: helpcontext<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 48<br class="">+YAML: FieldOffset: 44<br class="">+YAML: Name: hidden<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 48<br class="">+YAML: FieldOffset: 45<br class="">+YAML: Name: restricted<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4146<br class="">+YAML: FieldOffset: 48<br class="">+YAML: Name: custom<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4146<br class="">+YAML: FieldOffset: 52<br class="">+YAML: Name: resource_name<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 19<br class="">+YAML: Options: [ None, HasConstructorOrDestructor, ContainsNestedClass, HasUniqueName ]<br class="">+YAML: FieldList: 4153<br class="">+YAML: Name: '__vc_attributes::moduleAttribute'<br class="">+YAML: UniqueName: '.?AUmoduleAttribute@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 56<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 0<br class="">+YAML: Name: eAnyUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 1<br class="">+YAML: Name: eCoClassUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 2<br class="">+YAML: Name: eCOMInterfaceUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 6<br class="">+YAML: Name: eInterfaceUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 8<br class="">+YAML: Name: eMemberUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 16<br class="">+YAML: Name: eMethodUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 32<br class="">+YAML: Name: eInterfaceMethodUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 64<br class="">+YAML: Name: eInterfaceMemberUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 128<br class="">+YAML: Name: eCoClassMemberUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 256<br class="">+YAML: Name: eCoClassMethodUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 768<br class="">+YAML: Name: eGlobalMethodUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 1024<br class="">+YAML: Name: eGlobalDataUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 2048<br class="">+YAML: Name: eClassUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 4096<br class="">+YAML: Name: eInterfaceParameterUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 12288<br class="">+YAML: Name: eMethodParameterUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 16384<br class="">+YAML: Name: eIDLModuleUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: -32768<br class="">+YAML: Name: eAnonymousUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 65536<br class="">+YAML: Name: eTypedefUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 131072<br class="">+YAML: Name: eUnionUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 262144<br class="">+YAML: Name: eEnumUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 524288<br class="">+YAML: Name: eDefineTagUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 1048576<br class="">+YAML: Name: eStructUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 2097152<br class="">+YAML: Name: eLocalUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 4194304<br class="">+YAML: Name: ePropertyUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 8388608<br class="">+YAML: Name: eEventUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 16777216<br class="">+YAML: Name: eTemplateUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 16777216<br class="">+YAML: Name: eModuleUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 33554432<br class="">+YAML: Name: eIllegalUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 67108864<br class="">+YAML: Name: eAsynchronousUsage<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 4161535<br class="">+YAML: Name: eAnyIDLUsage<br class="">+YAML: - Kind: LF_ENUM<br class="">+YAML: Enum: <br class="">+YAML: NumEnumerators: 30<br class="">+YAML: Options: [ None, Nested, HasUniqueName ]<br class="">+YAML: FieldList: 4155<br class="">+YAML: Name: '__vc_attributes::helper_attributes::usageAttribute::usage_e'<br class="">+YAML: UniqueName: '.?AW4usage_e@usageAttribute@helper_attributes@__vc_attributes@@'<br class="">+YAML: UnderlyingType: 116<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 0<br class="">+YAML: Options: [ None, ForwardReference, HasUniqueName ]<br class="">+YAML: FieldList: 0<br class="">+YAML: Name: '__vc_attributes::helper_attributes::usageAttribute'<br class="">+YAML: UniqueName: '.?AUusageAttribute@helper_attributes@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 0<br class="">+YAML: - Kind: LF_POINTER<br class="">+YAML: Pointer: <br class="">+YAML: ReferentType: 4157<br class="">+YAML: PtrKind: Near32<br class="">+YAML: Mode: Pointer<br class="">+YAML: Options: [ None, Const ]<br class="">+YAML: Size: 4<br class="">+YAML: - Kind: LF_ARGLIST<br class="">+YAML: ArgList: <br class="">+YAML: ArgIndices: [ 117 ]<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4157<br class="">+YAML: ThisType: 4158<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 1<br class="">+YAML: ArgumentList: 4159<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_NESTTYPE<br class="">+YAML: NestedType: <br class="">+YAML: Type: 4156<br class="">+YAML: Name: usage_e<br class="">+YAML: Kind: LF_ONEMETHOD<br class="">+YAML: OneMethod: <br class="">+YAML: Type: 4160<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: usageAttribute<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 117<br class="">+YAML: FieldOffset: 0<br class="">+YAML: Name: value<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 3<br class="">+YAML: Options: [ None, HasConstructorOrDestructor, ContainsNestedClass, HasUniqueName ]<br class="">+YAML: FieldList: 4161<br class="">+YAML: Name: '__vc_attributes::helper_attributes::usageAttribute'<br class="">+YAML: UniqueName: '.?AUusageAttribute@helper_attributes@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 4<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 0<br class="">+YAML: Name: eBoolean<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 1<br class="">+YAML: Name: eInteger<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 2<br class="">+YAML: Name: eFloat<br class="">+YAML: Kind: LF_ENUMERATE<br class="">+YAML: Enumerator: <br class="">+YAML: Access: Public<br class="">+YAML: Value: 3<br class="">+YAML: Name: eDouble<br class="">+YAML: - Kind: LF_ENUM<br class="">+YAML: Enum: <br class="">+YAML: NumEnumerators: 4<br class="">+YAML: Options: [ None, Nested, HasUniqueName ]<br class="">+YAML: FieldList: 4163<br class="">+YAML: Name: '__vc_attributes::helper_attributes::v1_alttypeAttribute::type_e'<br class="">+YAML: UniqueName: '.?AW4type_e@v1_alttypeAttribute@helper_attributes@__vc_attributes@@'<br class="">+YAML: UnderlyingType: 116<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 0<br class="">+YAML: Options: [ None, ForwardReference, HasUniqueName ]<br class="">+YAML: FieldList: 0<br class="">+YAML: Name: '__vc_attributes::helper_attributes::v1_alttypeAttribute'<br class="">+YAML: UniqueName: '.?AUv1_alttypeAttribute@helper_attributes@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 0<br class="">+YAML: - Kind: LF_POINTER<br class="">+YAML: Pointer: <br class="">+YAML: ReferentType: 4165<br class="">+YAML: PtrKind: Near32<br class="">+YAML: Mode: Pointer<br class="">+YAML: Options: [ None, Const ]<br class="">+YAML: Size: 4<br class="">+YAML: - Kind: LF_ARGLIST<br class="">+YAML: ArgList: <br class="">+YAML: ArgIndices: [ 4164 ]<br class="">+YAML: - Kind: LF_MFUNCTION<br class="">+YAML: MemberFunction: <br class="">+YAML: ReturnType: 3<br class="">+YAML: ClassType: 4165<br class="">+YAML: ThisType: 4166<br class="">+YAML: CallConv: ThisCall<br class="">+YAML: Options: [ None, Constructor ]<br class="">+YAML: ParameterCount: 1<br class="">+YAML: ArgumentList: 4167<br class="">+YAML: ThisPointerAdjustment: 0<br class="">+YAML: - Kind: LF_FIELDLIST<br class="">+YAML: FieldList: <br class="">+YAML: Kind: LF_NESTTYPE<br class="">+YAML: NestedType: <br class="">+YAML: Type: 4164<br class="">+YAML: Name: type_e<br class="">+YAML: Kind: LF_ONEMETHOD<br class="">+YAML: OneMethod: <br class="">+YAML: Type: 4168<br class="">+YAML: Kind: Vanilla<br class="">+YAML: Options: [ None ]<br class="">+YAML: Access: Public<br class="">+YAML: VFTableOffset: -1<br class="">+YAML: Name: v1_alttypeAttribute<br class="">+YAML: Kind: LF_MEMBER<br class="">+YAML: DataMember: <br class="">+YAML: Access: Public<br class="">+YAML: Type: 4164<br class="">+YAML: FieldOffset: 0<br class="">+YAML: Name: type<br class="">+YAML: - Kind: LF_STRUCTURE<br class="">+YAML: Class: <br class="">+YAML: MemberCount: 3<br class="">+YAML: Options: [ None, HasConstructorOrDestructor, ContainsNestedClass, HasUniqueName ]<br class="">+YAML: FieldList: 4169<br class="">+YAML: Name: '__vc_attributes::helper_attributes::v1_alttypeAttribute'<br class="">+YAML: UniqueName: '.?AUv1_alttypeAttribute@helper_attributes@__vc_attributes@@'<br class="">+YAML: Hfa: None<br class="">+YAML: WinRTKind: None<br class="">+YAML: DerivationList: 0<br class="">+YAML: VTableShape: 0<br class="">+YAML: Size: 4<br class="">+YAML: ...<br class=""><br class="">Modified: llvm/trunk/tools/llvm-pdbdump/CMakeLists.txt<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/CMakeLists.txt?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/CMakeLists.txt?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/tools/llvm-pdbdump/CMakeLists.txt (original)<br class="">+++ llvm/trunk/tools/llvm-pdbdump/CMakeLists.txt Thu Aug 18 11:49:29 2016<br class="">@@ -10,6 +10,7 @@ add_llvm_tool(llvm-pdbdump<br class=""> llvm-pdbdump.cpp<br class=""> BuiltinDumper.cpp<br class=""> ClassDefinitionDumper.cpp<br class="">+ CodeViewYaml.cpp<br class=""> CompilandDumper.cpp<br class=""> EnumDumper.cpp<br class=""> ExternalSymbolDumper.cpp<br class=""><br class="">Added: llvm/trunk/tools/llvm-pdbdump/CodeViewYaml.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/CodeViewYaml.cpp?rev=279089&view=auto" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/CodeViewYaml.cpp?rev=279089&view=auto</a><br class="">==============================================================================<br class="">--- llvm/trunk/tools/llvm-pdbdump/CodeViewYaml.cpp (added)<br class="">+++ llvm/trunk/tools/llvm-pdbdump/CodeViewYaml.cpp Thu Aug 18 11:49:29 2016<br class="">@@ -0,0 +1,506 @@<br class="">+//===- PdbYAML.cpp -------------------------------------------- *- C++ --*-===//<br class="">+//<br class="">+// The LLVM Compiler Infrastructure<br class="">+//<br class="">+// This file is distributed under the University of Illinois Open Source<br class="">+// License. See LICENSE.TXT for details.<br class="">+//<br class="">+//===----------------------------------------------------------------------===//<br class="">+<br class="">+#include "CodeViewYaml.h"<br class="">+<br class="">+#include "llvm/DebugInfo/CodeView/CVTypeVisitor.h"<br class="">+#include "llvm/DebugInfo/CodeView/EnumTables.h"<br class="">+#include "llvm/DebugInfo/CodeView/TypeDeserializer.h"<br class="">+#include "llvm/DebugInfo/CodeView/TypeRecord.h"<br class="">+<br class="">+using namespace llvm;<br class="">+using namespace llvm::codeview;<br class="">+using namespace llvm::codeview::yaml;<br class="">+<br class="">+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(TypeIndex)<br class="">+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint64_t)<br class="">+LLVM_YAML_IS_SEQUENCE_VECTOR(OneMethodRecord)<br class="">+LLVM_YAML_IS_SEQUENCE_VECTOR(VFTableSlotKind)<br class="">+LLVM_YAML_IS_SEQUENCE_VECTOR(StringRef)<br class="">+LLVM_YAML_IS_SEQUENCE_VECTOR(CVType)<br class="">+<br class="">+namespace llvm {<br class="">+namespace yaml {<br class="">+template <> struct ScalarEnumerationTraits<PointerToMemberRepresentation> {<br class="">+ static void enumeration(IO &IO, PointerToMemberRepresentation &Value) {<br class="">+ IO.enumCase(Value, "Unknown", PointerToMemberRepresentation::Unknown);<br class="">+ IO.enumCase(Value, "SingleInheritanceData",<br class="">+ PointerToMemberRepresentation::SingleInheritanceData);<br class="">+ IO.enumCase(Value, "MultipleInheritanceData",<br class="">+ PointerToMemberRepresentation::MultipleInheritanceData);<br class="">+ IO.enumCase(Value, "VirtualInheritanceData",<br class="">+ PointerToMemberRepresentation::VirtualInheritanceData);<br class="">+ IO.enumCase(Value, "GeneralData",<br class="">+ PointerToMemberRepresentation::GeneralData);<br class="">+ IO.enumCase(Value, "SingleInheritanceFunction",<br class="">+ PointerToMemberRepresentation::SingleInheritanceFunction);<br class="">+ IO.enumCase(Value, "MultipleInheritanceFunction",<br class="">+ PointerToMemberRepresentation::MultipleInheritanceFunction);<br class="">+ IO.enumCase(Value, "VirtualInheritanceFunction",<br class="">+ PointerToMemberRepresentation::VirtualInheritanceFunction);<br class="">+ IO.enumCase(Value, "GeneralFunction",<br class="">+ PointerToMemberRepresentation::GeneralFunction);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarEnumerationTraits<VFTableSlotKind> {<br class="">+ static void enumeration(IO &IO, VFTableSlotKind &Kind) {<br class="">+ IO.enumCase(Kind, "Near16", VFTableSlotKind::Near16);<br class="">+ IO.enumCase(Kind, "Far16", VFTableSlotKind::Far16);<br class="">+ IO.enumCase(Kind, "This", VFTableSlotKind::This);<br class="">+ IO.enumCase(Kind, "Outer", VFTableSlotKind::Outer);<br class="">+ IO.enumCase(Kind, "Meta", VFTableSlotKind::Meta);<br class="">+ IO.enumCase(Kind, "Near", VFTableSlotKind::Near);<br class="">+ IO.enumCase(Kind, "Far", VFTableSlotKind::Far);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarEnumerationTraits<CallingConvention> {<br class="">+ static void enumeration(IO &IO, CallingConvention &Value) {<br class="">+ IO.enumCase(Value, "NearC", CallingConvention::NearC);<br class="">+ IO.enumCase(Value, "FarC", CallingConvention::FarC);<br class="">+ IO.enumCase(Value, "NearPascal", CallingConvention::NearPascal);<br class="">+ IO.enumCase(Value, "FarPascal", CallingConvention::FarPascal);<br class="">+ IO.enumCase(Value, "NearFast", CallingConvention::NearFast);<br class="">+ IO.enumCase(Value, "FarFast", CallingConvention::FarFast);<br class="">+ IO.enumCase(Value, "NearStdCall", CallingConvention::NearStdCall);<br class="">+ IO.enumCase(Value, "FarStdCall", CallingConvention::FarStdCall);<br class="">+ IO.enumCase(Value, "NearSysCall", CallingConvention::NearSysCall);<br class="">+ IO.enumCase(Value, "FarSysCall", CallingConvention::FarSysCall);<br class="">+ IO.enumCase(Value, "ThisCall", CallingConvention::ThisCall);<br class="">+ IO.enumCase(Value, "MipsCall", CallingConvention::MipsCall);<br class="">+ IO.enumCase(Value, "Generic", CallingConvention::Generic);<br class="">+ IO.enumCase(Value, "AlphaCall", CallingConvention::AlphaCall);<br class="">+ IO.enumCase(Value, "PpcCall", CallingConvention::PpcCall);<br class="">+ IO.enumCase(Value, "SHCall", CallingConvention::SHCall);<br class="">+ IO.enumCase(Value, "ArmCall", CallingConvention::ArmCall);<br class="">+ IO.enumCase(Value, "AM33Call", CallingConvention::AM33Call);<br class="">+ IO.enumCase(Value, "TriCall", CallingConvention::TriCall);<br class="">+ IO.enumCase(Value, "SH5Call", CallingConvention::SH5Call);<br class="">+ IO.enumCase(Value, "M32RCall", CallingConvention::M32RCall);<br class="">+ IO.enumCase(Value, "ClrCall", CallingConvention::ClrCall);<br class="">+ IO.enumCase(Value, "Inline", CallingConvention::Inline);<br class="">+ IO.enumCase(Value, "NearVector", CallingConvention::NearVector);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarEnumerationTraits<PointerKind> {<br class="">+ static void enumeration(IO &IO, PointerKind &Kind) {<br class="">+ IO.enumCase(Kind, "Near16", PointerKind::Near16);<br class="">+ IO.enumCase(Kind, "Far16", PointerKind::Far16);<br class="">+ IO.enumCase(Kind, "Huge16", PointerKind::Huge16);<br class="">+ IO.enumCase(Kind, "BasedOnSegment", PointerKind::BasedOnSegment);<br class="">+ IO.enumCase(Kind, "BasedOnValue", PointerKind::BasedOnValue);<br class="">+ IO.enumCase(Kind, "BasedOnSegmentValue", PointerKind::BasedOnSegmentValue);<br class="">+ IO.enumCase(Kind, "BasedOnAddress", PointerKind::BasedOnAddress);<br class="">+ IO.enumCase(Kind, "BasedOnSegmentAddress",<br class="">+ PointerKind::BasedOnSegmentAddress);<br class="">+ IO.enumCase(Kind, "BasedOnType", PointerKind::BasedOnType);<br class="">+ IO.enumCase(Kind, "BasedOnSelf", PointerKind::BasedOnSelf);<br class="">+ IO.enumCase(Kind, "Near32", PointerKind::Near32);<br class="">+ IO.enumCase(Kind, "Far32", PointerKind::Far32);<br class="">+ IO.enumCase(Kind, "Near64", PointerKind::Near64);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarEnumerationTraits<PointerMode> {<br class="">+ static void enumeration(IO &IO, PointerMode &Mode) {<br class="">+ IO.enumCase(Mode, "Pointer", PointerMode::Pointer);<br class="">+ IO.enumCase(Mode, "LValueReference", PointerMode::LValueReference);<br class="">+ IO.enumCase(Mode, "PointerToDataMember", PointerMode::PointerToDataMember);<br class="">+ IO.enumCase(Mode, "PointerToMemberFunction",<br class="">+ PointerMode::PointerToMemberFunction);<br class="">+ IO.enumCase(Mode, "RValueReference", PointerMode::RValueReference);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarEnumerationTraits<HfaKind> {<br class="">+ static void enumeration(IO &IO, HfaKind &Value) {<br class="">+ IO.enumCase(Value, "None", HfaKind::None);<br class="">+ IO.enumCase(Value, "Float", HfaKind::Float);<br class="">+ IO.enumCase(Value, "Double", HfaKind::Double);<br class="">+ IO.enumCase(Value, "Other", HfaKind::Other);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarEnumerationTraits<MemberAccess> {<br class="">+ static void enumeration(IO &IO, MemberAccess &Access) {<br class="">+ IO.enumCase(Access, "None", MemberAccess::None);<br class="">+ IO.enumCase(Access, "Private", MemberAccess::Private);<br class="">+ IO.enumCase(Access, "Protected", MemberAccess::Protected);<br class="">+ IO.enumCase(Access, "Public", MemberAccess::Public);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarEnumerationTraits<MethodKind> {<br class="">+ static void enumeration(IO &IO, MethodKind &Kind) {<br class="">+ IO.enumCase(Kind, "Vanilla", MethodKind::Vanilla);<br class="">+ IO.enumCase(Kind, "Virtual", MethodKind::Virtual);<br class="">+ IO.enumCase(Kind, "Static", MethodKind::Static);<br class="">+ IO.enumCase(Kind, "Friend", MethodKind::Friend);<br class="">+ IO.enumCase(Kind, "IntroducingVirtual", MethodKind::IntroducingVirtual);<br class="">+ IO.enumCase(Kind, "PureVirtual", MethodKind::PureVirtual);<br class="">+ IO.enumCase(Kind, "PureIntroducingVirtual",<br class="">+ MethodKind::PureIntroducingVirtual);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarEnumerationTraits<WindowsRTClassKind> {<br class="">+ static void enumeration(IO &IO, WindowsRTClassKind &Value) {<br class="">+ IO.enumCase(Value, "None", WindowsRTClassKind::None);<br class="">+ IO.enumCase(Value, "Ref", WindowsRTClassKind::RefClass);<br class="">+ IO.enumCase(Value, "Value", WindowsRTClassKind::ValueClass);<br class="">+ IO.enumCase(Value, "Interface", WindowsRTClassKind::Interface);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarBitSetTraits<PointerOptions> {<br class="">+ static void bitset(IO &IO, PointerOptions &Options) {<br class="">+ IO.bitSetCase(Options, "None", PointerOptions::None);<br class="">+ IO.bitSetCase(Options, "Flat32", PointerOptions::Flat32);<br class="">+ IO.bitSetCase(Options, "Volatile", PointerOptions::Volatile);<br class="">+ IO.bitSetCase(Options, "Const", PointerOptions::Const);<br class="">+ IO.bitSetCase(Options, "Unaligned", PointerOptions::Unaligned);<br class="">+ IO.bitSetCase(Options, "Restrict", PointerOptions::Restrict);<br class="">+ IO.bitSetCase(Options, "WinRTSmartPointer",<br class="">+ PointerOptions::WinRTSmartPointer);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarBitSetTraits<ModifierOptions> {<br class="">+ static void bitset(IO &IO, ModifierOptions &Options) {<br class="">+ IO.bitSetCase(Options, "None", ModifierOptions::None);<br class="">+ IO.bitSetCase(Options, "Const", ModifierOptions::Const);<br class="">+ IO.bitSetCase(Options, "Volatile", ModifierOptions::Volatile);<br class="">+ IO.bitSetCase(Options, "Unaligned", ModifierOptions::Unaligned);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarBitSetTraits<FunctionOptions> {<br class="">+ static void bitset(IO &IO, FunctionOptions &Options) {<br class="">+ IO.bitSetCase(Options, "None", FunctionOptions::None);<br class="">+ IO.bitSetCase(Options, "CxxReturnUdt", FunctionOptions::CxxReturnUdt);<br class="">+ IO.bitSetCase(Options, "Constructor", FunctionOptions::Constructor);<br class="">+ IO.bitSetCase(Options, "ConstructorWithVirtualBases",<br class="">+ FunctionOptions::ConstructorWithVirtualBases);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarBitSetTraits<ClassOptions> {<br class="">+ static void bitset(IO &IO, ClassOptions &Options) {<br class="">+ IO.bitSetCase(Options, "None", ClassOptions::None);<br class="">+ IO.bitSetCase(Options, "HasConstructorOrDestructor",<br class="">+ ClassOptions::HasConstructorOrDestructor);<br class="">+ IO.bitSetCase(Options, "HasOverloadedOperator",<br class="">+ ClassOptions::HasOverloadedOperator);<br class="">+ IO.bitSetCase(Options, "Nested", ClassOptions::Nested);<br class="">+ IO.bitSetCase(Options, "ContainsNestedClass",<br class="">+ ClassOptions::ContainsNestedClass);<br class="">+ IO.bitSetCase(Options, "HasOverloadedAssignmentOperator",<br class="">+ ClassOptions::HasOverloadedAssignmentOperator);<br class="">+ IO.bitSetCase(Options, "HasConversionOperator",<br class="">+ ClassOptions::HasConversionOperator);<br class="">+ IO.bitSetCase(Options, "ForwardReference", ClassOptions::ForwardReference);<br class="">+ IO.bitSetCase(Options, "Scoped", ClassOptions::Scoped);<br class="">+ IO.bitSetCase(Options, "HasUniqueName", ClassOptions::HasUniqueName);<br class="">+ IO.bitSetCase(Options, "Sealed", ClassOptions::Sealed);<br class="">+ IO.bitSetCase(Options, "Intrinsic", ClassOptions::Intrinsic);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarBitSetTraits<MethodOptions> {<br class="">+ static void bitset(IO &IO, MethodOptions &Options) {<br class="">+ IO.bitSetCase(Options, "None", MethodOptions::None);<br class="">+ IO.bitSetCase(Options, "Pseudo", MethodOptions::Pseudo);<br class="">+ IO.bitSetCase(Options, "NoInherit", MethodOptions::NoInherit);<br class="">+ IO.bitSetCase(Options, "NoConstruct", MethodOptions::NoConstruct);<br class="">+ IO.bitSetCase(Options, "CompilerGenerated",<br class="">+ MethodOptions::CompilerGenerated);<br class="">+ IO.bitSetCase(Options, "Sealed", MethodOptions::Sealed);<br class="">+ }<br class="">+};<br class="">+<br class="">+template <> struct ScalarTraits<APSInt> {<br class="">+ static void output(const APSInt &S, void *, llvm::raw_ostream &OS) {<br class="">+ S.print(OS, true);<br class="">+ }<br class="">+ static StringRef input(StringRef Scalar, void *Ctx, APSInt &S) {<br class="">+ S = APSInt(Scalar);<br class="">+ return "";<br class="">+ }<br class="">+<br class="">+ static bool mustQuote(StringRef Scalar) { return false; }<br class="">+};<br class="">+<br class="">+void MappingTraits<CVType>::mapping(IO &IO, CVType &Record) {<br class="">+ if (IO.outputting()) {<br class="">+ codeview::yaml::YamlTypeDumperCallbacks Callbacks(IO);<br class="">+ codeview::TypeDeserializer Deserializer(Callbacks);<br class="">+<br class="">+ codeview::CVTypeVisitor Visitor(Deserializer);<br class="">+ consumeError(Visitor.visitTypeRecord(Record));<br class="">+ }<br class="">+}<br class="">+<br class="">+void MappingTraits<FieldListRecord>::mapping(IO &IO,<br class="">+ FieldListRecord &FieldList) {<br class="">+ if (IO.outputting()) {<br class="">+ codeview::yaml::YamlTypeDumperCallbacks Callbacks(IO);<br class="">+ codeview::TypeDeserializer Deserializer(Callbacks);<br class="">+ codeview::CVTypeVisitor Visitor(Deserializer);<br class="">+ consumeError(Visitor.visitFieldListMemberStream(FieldList.Data));<br class="">+ }<br class="">+}<br class="">+<br class="">+void MappingTraits<StringIdRecord>::mapping(IO &IO, StringIdRecord &String) {<br class="">+ IO.mapRequired("Id", String.Id);<br class="">+ IO.mapRequired("String", String.String);<br class="">+}<br class="">+<br class="">+void MappingTraits<ArgListRecord>::mapping(IO &IO, ArgListRecord &Args) {<br class="">+ IO.mapRequired("ArgIndices", Args.StringIndices);<br class="">+}<br class="">+<br class="">+void MappingTraits<ClassRecord>::mapping(IO &IO, ClassRecord &Class) {<br class="">+ IO.mapRequired("MemberCount", Class.MemberCount);<br class="">+ IO.mapRequired("Options", Class.Options);<br class="">+ IO.mapRequired("FieldList", Class.FieldList);<br class="">+ IO.mapRequired("Name", Class.Name);<br class="">+ IO.mapRequired("UniqueName", Class.UniqueName);<br class="">+ IO.mapRequired("Hfa", Class.Hfa);<br class="">+ IO.mapRequired("WinRTKind", Class.WinRTKind);<br class="">+ IO.mapRequired("DerivationList", Class.DerivationList);<br class="">+ IO.mapRequired("VTableShape", Class.VTableShape);<br class="">+ IO.mapRequired("Size", Class.Size);<br class="">+}<br class="">+<br class="">+void MappingTraits<UnionRecord>::mapping(IO &IO, UnionRecord &Union) {<br class="">+ IO.mapRequired("MemberCount", Union.MemberCount);<br class="">+ IO.mapRequired("Options", Union.Options);<br class="">+ IO.mapRequired("FieldList", Union.FieldList);<br class="">+ IO.mapRequired("Name", Union.Name);<br class="">+ IO.mapRequired("UniqueName", Union.UniqueName);<br class="">+ IO.mapRequired("Hfa", Union.Hfa);<br class="">+ IO.mapRequired("Size", Union.Size);<br class="">+}<br class="">+<br class="">+void MappingTraits<EnumRecord>::mapping(IO &IO, EnumRecord &Enum) {<br class="">+ IO.mapRequired("NumEnumerators", Enum.MemberCount);<br class="">+ IO.mapRequired("Options", Enum.Options);<br class="">+ IO.mapRequired("FieldList", Enum.FieldList);<br class="">+ IO.mapRequired("Name", Enum.Name);<br class="">+ IO.mapRequired("UniqueName", Enum.UniqueName);<br class="">+ IO.mapRequired("UnderlyingType", Enum.UnderlyingType);<br class="">+}<br class="">+<br class="">+void MappingTraits<ArrayRecord>::mapping(IO &IO, ArrayRecord &AT) {<br class="">+ IO.mapRequired("ElementType", AT.ElementType);<br class="">+ IO.mapRequired("IndexType", AT.IndexType);<br class="">+ IO.mapRequired("Size", AT.Size);<br class="">+ IO.mapRequired("Name", AT.Name);<br class="">+}<br class="">+<br class="">+void MappingTraits<VFTableRecord>::mapping(IO &IO, VFTableRecord &VFT) {<br class="">+ IO.mapRequired("CompleteClass", VFT.CompleteClass);<br class="">+ IO.mapRequired("OverriddenVFTable", VFT.OverriddenVFTable);<br class="">+ IO.mapRequired("VFPtrOffset", VFT.VFPtrOffset);<br class="">+ IO.mapRequired("Name", VFT.Name);<br class="">+ IO.mapRequired("MethodNames", VFT.MethodNames);<br class="">+}<br class="">+<br class="">+void MappingTraits<MemberFuncIdRecord>::mapping(IO &IO,<br class="">+ MemberFuncIdRecord &Id) {<br class="">+ IO.mapRequired("ClassType", Id.ClassType);<br class="">+ IO.mapRequired("FunctionType", Id.FunctionType);<br class="">+ IO.mapRequired("Name", Id.Name);<br class="">+}<br class="">+<br class="">+void MappingTraits<ProcedureRecord>::mapping(IO &IO, ProcedureRecord &Proc) {<br class="">+ IO.mapRequired("ReturnType", Proc.ReturnType);<br class="">+ IO.mapRequired("CallConv", Proc.CallConv);<br class="">+ IO.mapRequired("Options", Proc.Options);<br class="">+ IO.mapRequired("ParameterCount", Proc.ParameterCount);<br class="">+ IO.mapRequired("ArgumentList", Proc.ArgumentList);<br class="">+}<br class="">+<br class="">+void MappingTraits<MemberFunctionRecord>::mapping(IO &IO,<br class="">+ MemberFunctionRecord &MF) {<br class="">+ IO.mapRequired("ReturnType", MF.ReturnType);<br class="">+ IO.mapRequired("ClassType", MF.ClassType);<br class="">+ IO.mapRequired("ThisType", MF.ThisType);<br class="">+ IO.mapRequired("CallConv", MF.CallConv);<br class="">+ IO.mapRequired("Options", MF.Options);<br class="">+ IO.mapRequired("ParameterCount", MF.ParameterCount);<br class="">+ IO.mapRequired("ArgumentList", MF.ArgumentList);<br class="">+ IO.mapRequired("ThisPointerAdjustment", MF.ThisPointerAdjustment);<br class="">+}<br class="">+<br class="">+void MappingTraits<MethodOverloadListRecord>::mapping(<br class="">+ IO &IO, MethodOverloadListRecord &MethodList) {<br class="">+ IO.mapRequired("Methods", MethodList.Methods);<br class="">+}<br class="">+<br class="">+void MappingTraits<FuncIdRecord>::mapping(IO &IO, FuncIdRecord &Func) {<br class="">+ IO.mapRequired("ParentScope", Func.ParentScope);<br class="">+ IO.mapRequired("FunctionType", Func.FunctionType);<br class="">+ IO.mapRequired("Name", Func.Name);<br class="">+}<br class="">+<br class="">+void MappingTraits<TypeServer2Record>::mapping(IO &IO, TypeServer2Record &TS) {<br class="">+ IO.mapRequired("Guid", TS.Guid);<br class="">+ IO.mapRequired("Age", TS.Age);<br class="">+ IO.mapRequired("Name", TS.Name);<br class="">+}<br class="">+<br class="">+void MappingTraits<PointerRecord>::mapping(IO &IO, PointerRecord &Ptr) {<br class="">+ IO.mapRequired("ReferentType", Ptr.ReferentType);<br class="">+ IO.mapRequired("PtrKind", Ptr.PtrKind);<br class="">+ IO.mapRequired("Mode", Ptr.Mode);<br class="">+ IO.mapRequired("Options", Ptr.Options);<br class="">+ IO.mapRequired("Size", Ptr.Size);<br class="">+ IO.mapOptional("MemberInfo", Ptr.MemberInfo);<br class="">+}<br class="">+<br class="">+void MappingTraits<MemberPointerInfo>::mapping(IO &IO, MemberPointerInfo &MPI) {<br class="">+ IO.mapRequired("ContainingType", MPI.ContainingType);<br class="">+ IO.mapRequired("Representation", MPI.Representation);<br class="">+}<br class="">+<br class="">+void MappingTraits<ModifierRecord>::mapping(IO &IO, ModifierRecord &Mod) {<br class="">+ IO.mapRequired("ModifiedType", Mod.ModifiedType);<br class="">+ IO.mapRequired("Modifiers", Mod.Modifiers);<br class="">+}<br class="">+<br class="">+void MappingTraits<BitFieldRecord>::mapping(IO &IO, BitFieldRecord &BitField) {<br class="">+ IO.mapRequired("Type", BitField.Type);<br class="">+ IO.mapRequired("BitSize", BitField.BitSize);<br class="">+ IO.mapRequired("BitOffset", BitField.BitOffset);<br class="">+}<br class="">+<br class="">+void MappingTraits<VFTableShapeRecord>::mapping(IO &IO,<br class="">+ VFTableShapeRecord &Shape) {<br class="">+ IO.mapRequired("Slots", Shape.Slots);<br class="">+}<br class="">+<br class="">+void MappingTraits<UdtSourceLineRecord>::mapping(IO &IO,<br class="">+ UdtSourceLineRecord &Line) {<br class="">+ IO.mapRequired("UDT", Line.UDT);<br class="">+ IO.mapRequired("SourceFile", Line.SourceFile);<br class="">+ IO.mapRequired("LineNumber", Line.LineNumber);<br class="">+}<br class="">+<br class="">+void MappingTraits<UdtModSourceLineRecord>::mapping(<br class="">+ IO &IO, UdtModSourceLineRecord &Line) {<br class="">+ IO.mapRequired("UDT", Line.UDT);<br class="">+ IO.mapRequired("SourceFile", Line.SourceFile);<br class="">+ IO.mapRequired("LineNumber", Line.LineNumber);<br class="">+ IO.mapRequired("Module", Line.Module);<br class="">+}<br class="">+<br class="">+void MappingTraits<BuildInfoRecord>::mapping(IO &IO, BuildInfoRecord &Args) {<br class="">+ IO.mapRequired("ArgIndices", Args.ArgIndices);<br class="">+}<br class="">+<br class="">+void MappingTraits<NestedTypeRecord>::mapping(IO &IO,<br class="">+ NestedTypeRecord &Nested) {<br class="">+ IO.mapRequired("Type", Nested.Type);<br class="">+ IO.mapRequired("Name", Nested.Name);<br class="">+}<br class="">+<br class="">+void MappingTraits<OneMethodRecord>::mapping(IO &IO, OneMethodRecord &Method) {<br class="">+ IO.mapRequired("Type", Method.Type);<br class="">+ IO.mapRequired("Kind", Method.Kind);<br class="">+ IO.mapRequired("Options", Method.Options);<br class="">+ IO.mapRequired("Access", Method.Access);<br class="">+ IO.mapRequired("VFTableOffset", Method.VFTableOffset);<br class="">+ IO.mapRequired("Name", Method.Name);<br class="">+}<br class="">+<br class="">+void MappingTraits<OverloadedMethodRecord>::mapping(<br class="">+ IO &IO, OverloadedMethodRecord &Method) {<br class="">+ IO.mapRequired("NumOverloads", Method.NumOverloads);<br class="">+ IO.mapRequired("MethodList", Method.MethodList);<br class="">+ IO.mapRequired("Name", Method.Name);<br class="">+}<br class="">+<br class="">+void MappingTraits<DataMemberRecord>::mapping(IO &IO, DataMemberRecord &Field) {<br class="">+ IO.mapRequired("Access", Field.Access);<br class="">+ IO.mapRequired("Type", Field.Type);<br class="">+ IO.mapRequired("FieldOffset", Field.FieldOffset);<br class="">+ IO.mapRequired("Name", Field.Name);<br class="">+}<br class="">+<br class="">+void MappingTraits<StaticDataMemberRecord>::mapping(<br class="">+ IO &IO, StaticDataMemberRecord &Field) {<br class="">+ IO.mapRequired("Access", Field.Access);<br class="">+ IO.mapRequired("Type", Field.Type);<br class="">+ IO.mapRequired("Name", Field.Name);<br class="">+}<br class="">+<br class="">+void MappingTraits<VFPtrRecord>::mapping(IO &IO, VFPtrRecord &VFTable) {<br class="">+ IO.mapRequired("Type", VFTable.Type);<br class="">+}<br class="">+<br class="">+void MappingTraits<EnumeratorRecord>::mapping(IO &IO, EnumeratorRecord &Enum) {<br class="">+ IO.mapRequired("Access", Enum.Access);<br class="">+ IO.mapRequired("Value", Enum.Value);<br class="">+ IO.mapRequired("Name", Enum.Name);<br class="">+}<br class="">+<br class="">+void MappingTraits<BaseClassRecord>::mapping(IO &IO, BaseClassRecord &Base) {<br class="">+ IO.mapRequired("Access", Base.Access);<br class="">+ IO.mapRequired("Type", Base.Type);<br class="">+ IO.mapRequired("Offset", Base.Offset);<br class="">+}<br class="">+<br class="">+void MappingTraits<VirtualBaseClassRecord>::mapping(<br class="">+ IO &IO, VirtualBaseClassRecord &Base) {<br class="">+ IO.mapRequired("Access", Base.Access);<br class="">+ IO.mapRequired("BaseType", Base.BaseType);<br class="">+ IO.mapRequired("VBPtrType", Base.VBPtrType);<br class="">+ IO.mapRequired("VBPtrOffset", Base.VBPtrOffset);<br class="">+ IO.mapRequired("VTableIndex", Base.VTableIndex);<br class="">+}<br class="">+<br class="">+void MappingTraits<ListContinuationRecord>::mapping(<br class="">+ IO &IO, ListContinuationRecord &Cont) {<br class="">+ IO.mapRequired("ContinuationIndex", Cont.ContinuationIndex);<br class="">+}<br class="">+<br class="">+template <> struct ScalarTraits<codeview::TypeIndex> {<br class="">+ static void output(const codeview::TypeIndex &S, void *,<br class="">+ llvm::raw_ostream &OS) {<br class="">+ OS << S.getIndex();<br class="">+ }<br class="">+ static StringRef input(StringRef Scalar, void *Ctx, codeview::TypeIndex &S) {<br class="">+ uint32_t I;<br class="">+ StringRef Result = ScalarTraits<uint32_t>::input(Scalar, Ctx, I);<br class="">+ if (!Result.empty())<br class="">+ return Result;<br class="">+ S = TypeIndex(I);<br class="">+ return "";<br class="">+ }<br class="">+ static bool mustQuote(StringRef Scalar) { return false; }<br class="">+};<br class="">+<br class="">+void ScalarEnumerationTraits<TypeLeafKind>::enumeration(IO &io,<br class="">+ TypeLeafKind &Value) {<br class="">+ auto TypeLeafNames = getTypeLeafNames();<br class="">+ for (const auto &E : TypeLeafNames)<br class="">+ io.enumCase(Value, E.Name.str().c_str(), E.Value);<br class="">+}<br class="">+}<br class="">+}<br class="">+<br class="">+Error llvm::codeview::yaml::YamlTypeDumperCallbacks::visitTypeBegin(<br class="">+ const CVRecord<TypeLeafKind> &CVR) {<br class="">+ TypeLeafKind K = CVR.Type;<br class="">+ YamlIO.mapRequired("Kind", K);<br class="">+ return Error::success();<br class="">+}<br class=""><br class="">Added: llvm/trunk/tools/llvm-pdbdump/CodeViewYaml.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/CodeViewYaml.h?rev=279089&view=auto" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/CodeViewYaml.h?rev=279089&view=auto</a><br class="">==============================================================================<br class="">--- llvm/trunk/tools/llvm-pdbdump/CodeViewYaml.h (added)<br class="">+++ llvm/trunk/tools/llvm-pdbdump/CodeViewYaml.h Thu Aug 18 11:49:29 2016<br class="">@@ -0,0 +1,71 @@<br class="">+//===- PdbYAML.h ---------------------------------------------- *- C++ --*-===//<br class="">+//<br class="">+// The LLVM Compiler Infrastructure<br class="">+//<br class="">+// This file is distributed under the University of Illinois Open Source<br class="">+// License. See LICENSE.TXT for details.<br class="">+//<br class="">+//===----------------------------------------------------------------------===//<br class="">+<br class="">+#ifndef LLVM_TOOLS_LLVMPDBDUMP_CODEVIEWYAML_H<br class="">+#define LLVM_TOOLS_LLVMPDBDUMP_CODEVIEWYAML_H<br class="">+<br class="">+#include "llvm/DebugInfo/CodeView/CodeView.h"<br class="">+#include "llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h"<br class="">+#include "llvm/Support/YAMLTraits.h"<br class="">+<br class="">+namespace llvm {<br class="">+namespace codeview {<br class="">+namespace yaml {<br class="">+class YamlTypeDumperCallbacks : public TypeVisitorCallbacks {<br class="">+public:<br class="">+ YamlTypeDumperCallbacks(llvm::yaml::IO &IO) : YamlIO(IO) {}<br class="">+<br class="">+ virtual Error visitTypeBegin(const CVRecord<TypeLeafKind> &Record) override;<br class="">+<br class="">+#define TYPE_RECORD(EnumName, EnumVal, Name) \<br class="">+ Error visitKnownRecord(const CVRecord<TypeLeafKind> &CVR, \<br class="">+ Name##Record &Record) override { \<br class="">+ YamlIO.mapRequired(#Name, Record); \<br class="">+ return Error::success(); \<br class="">+ }<br class="">+#define MEMBER_RECORD(EnumName, EnumVal, Name) \<br class="">+ TYPE_RECORD(EnumName, EnumVal, Name)<br class="">+#define TYPE_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)<br class="">+#define MEMBER_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)<br class="">+#include "llvm/DebugInfo/CodeView/TypeRecords.def"<br class="">+<br class="">+private:<br class="">+ llvm::yaml::IO &YamlIO;<br class="">+};<br class="">+}<br class="">+}<br class="">+}<br class="">+<br class="">+namespace llvm {<br class="">+namespace yaml {<br class="">+template <> struct MappingTraits<codeview::MemberPointerInfo> {<br class="">+ static void mapping(IO &IO, codeview::MemberPointerInfo &Obj);<br class="">+};<br class="">+<br class="">+template <> struct MappingTraits<codeview::CVType> {<br class="">+ static void mapping(IO &IO, codeview::CVType &Obj);<br class="">+};<br class="">+<br class="">+template <> struct ScalarEnumerationTraits<codeview::TypeLeafKind> {<br class="">+ static void enumeration(IO &io, codeview::TypeLeafKind &Value);<br class="">+};<br class="">+<br class="">+#define TYPE_RECORD(EnumName, EnumVal, Name) \<br class="">+ template <> struct MappingTraits<codeview::Name##Record> { \<br class="">+ static void mapping(IO &IO, codeview::Name##Record &Obj); \<br class="">+ };<br class="">+#define MEMBER_RECORD(EnumName, EnumVal, Name) \<br class="">+ TYPE_RECORD(EnumName, EnumVal, Name)<br class="">+#define TYPE_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)<br class="">+#define MEMBER_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)<br class="">+#include "llvm/DebugInfo/CodeView/TypeRecords.def"<br class="">+}<br class="">+}<br class="">+<br class="">+#endif<br class=""><br class="">Modified: llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp (original)<br class="">+++ llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp Thu Aug 18 11:49:29 2016<br class="">@@ -8,18 +8,29 @@<br class=""> //===----------------------------------------------------------------------===//<br class=""><br class=""> #include "PdbYaml.h"<br class="">+#include "CodeViewYaml.h"<br class=""><br class="">+#include "llvm/DebugInfo/CodeView/CVTypeVisitor.h"<br class="">+#include "llvm/DebugInfo/CodeView/TypeDeserializer.h"<br class=""> #include "llvm/DebugInfo/PDB/PDBExtras.h"<br class="">+#include "llvm/DebugInfo/PDB/PDBTypes.h"<br class=""> #include "llvm/DebugInfo/PDB/Raw/PDBFile.h"<br class=""><br class=""> using namespace llvm;<br class="">-using namespace llvm::msf;<br class="">-using namespace llvm::yaml;<br class=""> using namespace llvm::pdb;<br class=""> using namespace llvm::pdb::yaml;<br class="">+using namespace llvm::yaml;<br class="">+<br class="">+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint32_t)<br class="">+LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::StringRef)<br class="">+LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::pdb::yaml::NamedStreamMapping)<br class="">+LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::pdb::yaml::PdbDbiModuleInfo)<br class="">+LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::pdb::yaml::PdbTpiRecord)<br class="">+LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::pdb::yaml::StreamBlockList)<br class=""><br class=""> namespace llvm {<br class=""> namespace yaml {<br class="">+<br class=""> template <> struct ScalarTraits<llvm::pdb::PDB_UniqueId> {<br class=""> static void output(const llvm::pdb::PDB_UniqueId &S, void *,<br class=""> llvm::raw_ostream &OS) {<br class="">@@ -102,6 +113,16 @@ template <> struct ScalarEnumerationTrai<br class=""> io.enumCase(Value, "VC140", llvm::pdb::PdbRaw_ImplVer::PdbImplVC140);<br class=""> }<br class=""> };<br class="">+<br class="">+template <> struct ScalarEnumerationTraits<llvm::pdb::PdbRaw_TpiVer> {<br class="">+ static void enumeration(IO &io, llvm::pdb::PdbRaw_TpiVer &Value) {<br class="">+ io.enumCase(Value, "VC40", llvm::pdb::PdbRaw_TpiVer::PdbTpiV40);<br class="">+ io.enumCase(Value, "VC41", llvm::pdb::PdbRaw_TpiVer::PdbTpiV41);<br class="">+ io.enumCase(Value, "VC50", llvm::pdb::PdbRaw_TpiVer::PdbTpiV50);<br class="">+ io.enumCase(Value, "VC70", llvm::pdb::PdbRaw_TpiVer::PdbTpiV70);<br class="">+ io.enumCase(Value, "VC80", llvm::pdb::PdbRaw_TpiVer::PdbTpiV80);<br class="">+ }<br class="">+};<br class=""> }<br class=""> }<br class=""><br class="">@@ -111,6 +132,7 @@ void MappingTraits<PdbObject>::mapping(I<br class=""> IO.mapOptional("StreamMap", Obj.StreamMap);<br class=""> IO.mapOptional("PdbStream", Obj.PdbStream);<br class=""> IO.mapOptional("DbiStream", Obj.DbiStream);<br class="">+ IO.mapOptional("TpiStream", Obj.TpiStream);<br class=""> }<br class=""><br class=""> void MappingTraits<MSFHeaders>::mapping(IO &IO, MSFHeaders &Obj) {<br class="">@@ -157,6 +179,12 @@ void MappingTraits<PdbDbiStream>::mappin<br class=""> IO.mapOptional("Modules", Obj.ModInfos);<br class=""> }<br class=""><br class="">+void MappingTraits<PdbTpiStream>::mapping(IO &IO,<br class="">+ pdb::yaml::PdbTpiStream &Obj) {<br class="">+ IO.mapRequired("Version", Obj.Version);<br class="">+ IO.mapRequired("Records", Obj.Records);<br class="">+}<br class="">+<br class=""> void MappingTraits<NamedStreamMapping>::mapping(IO &IO,<br class=""> NamedStreamMapping &Obj) {<br class=""> IO.mapRequired("Name", Obj.StreamName);<br class="">@@ -168,3 +196,19 @@ void MappingTraits<PdbDbiModuleInfo>::ma<br class=""> IO.mapRequired("ObjFile", Obj.Obj);<br class=""> IO.mapOptional("SourceFiles", Obj.SourceFiles);<br class=""> }<br class="">+<br class="">+void MappingTraits<PdbTpiRecord>::mapping(IO &IO,<br class="">+ pdb::yaml::PdbTpiRecord &Obj) {<br class="">+ if (IO.outputting()) {<br class="">+ // If we're going from Pdb To Yaml, deserialize the Pdb record<br class="">+ codeview::yaml::YamlTypeDumperCallbacks Callbacks(IO);<br class="">+ codeview::TypeDeserializer Deserializer(Callbacks);<br class="">+<br class="">+ codeview::CVTypeVisitor Visitor(Deserializer);<br class="">+ consumeError(Visitor.visitTypeRecord(Obj.Record));<br class="">+ } else {<br class="">+ codeview::yaml::YamlTypeDumperCallbacks Callbacks(IO);<br class="">+ codeview::CVTypeVisitor Visitor(Callbacks);<br class="">+ consumeError(Visitor.visitTypeRecord(Obj.Record));<br class="">+ }<br class="">+}<br class=""><br class="">Modified: llvm/trunk/tools/llvm-pdbdump/PdbYaml.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/PdbYaml.h?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/PdbYaml.h?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/tools/llvm-pdbdump/PdbYaml.h (original)<br class="">+++ llvm/trunk/tools/llvm-pdbdump/PdbYaml.h Thu Aug 18 11:49:29 2016<br class="">@@ -69,12 +69,23 @@ struct PdbDbiStream {<br class=""> std::vector<PdbDbiModuleInfo> ModInfos;<br class=""> };<br class=""><br class="">+struct PdbTpiRecord {<br class="">+ std::vector<uint8_t> RecordData;<br class="">+ codeview::CVType Record;<br class="">+};<br class="">+<br class="">+struct PdbTpiStream {<br class="">+ PdbRaw_TpiVer Version;<br class="">+ std::vector<PdbTpiRecord> Records;<br class="">+};<br class="">+<br class=""> struct PdbObject {<br class=""> Optional<MSFHeaders> Headers;<br class=""> Optional<std::vector<uint32_t>> StreamSizes;<br class=""> Optional<std::vector<StreamBlockList>> StreamMap;<br class=""> Optional<PdbInfoStream> PdbStream;<br class=""> Optional<PdbDbiStream> DbiStream;<br class="">+ Optional<PdbTpiStream> TpiStream;<br class=""> };<br class=""> }<br class=""> }<br class="">@@ -107,6 +118,10 @@ template <> struct MappingTraits<pdb::ya<br class=""> static void mapping(IO &IO, pdb::yaml::PdbDbiStream &Obj);<br class=""> };<br class=""><br class="">+template <> struct MappingTraits<pdb::yaml::PdbTpiStream> {<br class="">+ static void mapping(IO &IO, pdb::yaml::PdbTpiStream &Obj);<br class="">+};<br class="">+<br class=""> template <> struct MappingTraits<pdb::yaml::NamedStreamMapping> {<br class=""> static void mapping(IO &IO, pdb::yaml::NamedStreamMapping &Obj);<br class=""> };<br class="">@@ -114,13 +129,11 @@ template <> struct MappingTraits<pdb::ya<br class=""> template <> struct MappingTraits<pdb::yaml::PdbDbiModuleInfo> {<br class=""> static void mapping(IO &IO, pdb::yaml::PdbDbiModuleInfo &Obj);<br class=""> };<br class="">+<br class="">+template <> struct MappingTraits<pdb::yaml::PdbTpiRecord> {<br class="">+ static void mapping(IO &IO, pdb::yaml::PdbTpiRecord &Obj);<br class="">+};<br class=""> }<br class=""> }<br class=""><br class="">-LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint32_t)<br class="">-LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::StringRef)<br class="">-LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::pdb::yaml::NamedStreamMapping)<br class="">-LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::pdb::yaml::PdbDbiModuleInfo)<br class="">-LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::pdb::yaml::StreamBlockList)<br class="">-<br class=""> #endif // LLVM_TOOLS_LLVMPDBDUMP_PDBYAML_H<br class=""><br class="">Modified: llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.cpp?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.cpp?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.cpp (original)<br class="">+++ llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.cpp Thu Aug 18 11:49:29 2016<br class="">@@ -16,6 +16,7 @@<br class=""> #include "llvm/DebugInfo/PDB/Raw/InfoStream.h"<br class=""> #include "llvm/DebugInfo/PDB/Raw/PDBFile.h"<br class=""> #include "llvm/DebugInfo/PDB/Raw/RawConstants.h"<br class="">+#include "llvm/DebugInfo/PDB/Raw/TpiStream.h"<br class=""><br class=""> using namespace llvm;<br class=""> using namespace llvm::pdb;<br class="">@@ -45,6 +46,9 @@ Error YAMLOutputStyle::dump() {<br class=""> if (auto EC = dumpDbiStream())<br class=""> return EC;<br class=""><br class="">+ if (auto EC = dumpTpiStream())<br class="">+ return EC;<br class="">+<br class=""> flush();<br class=""> return Error::success();<br class=""> }<br class="">@@ -150,6 +154,30 @@ Error YAMLOutputStyle::dumpDbiStream() {<br class=""> return Error::success();<br class=""> }<br class=""><br class="">+Error YAMLOutputStyle::dumpTpiStream() {<br class="">+ if (!opts::pdb2yaml::TpiStream)<br class="">+ return Error::success();<br class="">+<br class="">+ auto TpiS = File.getPDBTpiStream();<br class="">+ if (!TpiS)<br class="">+ return TpiS.takeError();<br class="">+<br class="">+ auto &TS = TpiS.get();<br class="">+ Obj.TpiStream.emplace();<br class="">+ Obj.TpiStream->Version = TS.getTpiVersion();<br class="">+ for (auto &Record : TS.types(nullptr)) {<br class="">+ yaml::PdbTpiRecord R;<br class="">+ // It's not necessary to set R.RecordData here. That only exists as a<br class="">+ // way to have the `PdbTpiRecord` structure own the memory that `R.Record`<br class="">+ // references. In the case of reading an existing PDB though, that memory<br class="">+ // is owned by the backing stream.<br class="">+ R.Record = Record;<br class="">+ Obj.TpiStream->Records.push_back(R);<br class="">+ }<br class="">+<br class="">+ return Error::success();<br class="">+}<br class="">+<br class=""> void YAMLOutputStyle::flush() {<br class=""> Out << Obj;<br class=""> outs().flush();<br class=""><br class="">Modified: llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.h?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.h?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.h (original)<br class="">+++ llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.h Thu Aug 18 11:49:29 2016<br class="">@@ -31,6 +31,7 @@ private:<br class=""> Error dumpStreamDirectory();<br class=""> Error dumpPDBStream();<br class=""> Error dumpDbiStream();<br class="">+ Error dumpTpiStream();<br class=""><br class=""> void flush();<br class=""><br class=""><br class="">Modified: llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp (original)<br class="">+++ llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp Thu Aug 18 11:49:29 2016<br class="">@@ -281,6 +281,10 @@ cl::opt<bool> DbiModuleSourceFileInfo(<br class=""> "Dump DBI Module Source File Information (implies -dbi-module-info"),<br class=""> cl::sub(PdbToYamlSubcommand), cl::init(false));<br class=""><br class="">+cl::opt<bool> TpiStream("tpi-stream",<br class="">+ cl::desc("Dump the TPI Stream (Stream 3)"),<br class="">+ cl::sub(PdbToYamlSubcommand), cl::init(false));<br class="">+<br class=""> cl::list<std::string> InputFilename(cl::Positional,<br class=""> cl::desc("<input PDB file>"), cl::Required,<br class=""> cl::sub(PdbToYamlSubcommand));<br class="">@@ -537,8 +541,7 @@ int main(int argc_, const char *argv_[])<br class=""><br class=""> cl::ParseCommandLineOptions(argv.size(), argv.data(), "LLVM PDB Dumper\n");<br class=""><br class="">- // These options are shared by two subcommands.<br class="">- if ((opts::PdbToYamlSubcommand || opts::RawSubcommand) && opts::raw::RawAll) {<br class="">+ if (opts::RawSubcommand && opts::raw::RawAll) {<br class=""> opts::raw::DumpHeaders = true;<br class=""> opts::raw::DumpModules = true;<br class=""> opts::raw::DumpModuleFiles = true;<br class=""><br class="">Modified: llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.h?rev=279089&r1=279088&r2=279089&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.h?rev=279089&r1=279088&r2=279089&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.h (original)<br class="">+++ llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.h Thu Aug 18 11:49:29 2016<br class="">@@ -65,6 +65,7 @@ extern llvm::cl::opt<bool> PdbStream;<br class=""> extern llvm::cl::opt<bool> DbiStream;<br class=""> extern llvm::cl::opt<bool> DbiModuleInfo;<br class=""> extern llvm::cl::opt<bool> DbiModuleSourceFileInfo;<br class="">+extern llvm::cl::opt<bool> TpiStream;<br class=""> extern llvm::cl::list<std::string> InputFilename;<br class=""> }<br class=""> }<br class=""><br class=""><br class="">_______________________________________________<br class="">llvm-commits mailing list<br class=""><a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a><br class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits<br class=""></div></div></blockquote></div><br class="">
<br class=""></div></body></html>