Refactor CodeView TypeRecord visitors to use common structures

[zturner]

Summary

If we don't want to go with the approach because it involves too much boilerplate, another approach would be to go back to what we were doing before, where we raise the Layout class outside of the memory-representation class and put the serialization on the Layout class. One of the problems now is that there are some cases where the deserialization is conditional, or we have to extract some bitfields to convert to the in memory format, so there's always a little bit of custom marshalling involved.

If we wanted to more easily generalize the deserialization, limiting it to the layout classes could provide better code reuse since you may be able to declare the layout classes declaratively with macros and then have a single deserialization function that is templatized and works for everything due to the declarative nature of the layout classes. Then you could have the in memory representation classes take a layout class to the constructor or something.

Either way, I don't think this is a bad first step, and I plan to generalize as much as possible using variadic templates in a followup patch.

[rnk]

There's some common patterns we should fix up for safety. I'll re-review all the .slice call sites again after the common patterns are fixed up.

include/llvm/DebugInfo/CodeView/CVTypeVisitor.h

73

This should be return parseError();, and if we were really cool we'd propagate out the Error. I'm fine with the existing bool.

include/llvm/DebugInfo/CodeView/CodeView.h

429

Eventually we should unify this with CVLeafTypes, but today is not that day.

include/llvm/DebugInfo/CodeView/TypeRecord.h

18

lib/DebugInfo/CodeView shouldn't depend on lib/Object, maybe go for std::errc::illegal_byte_sequence or something for now.

115–118

Is there a reason to not use consumeObject here?

164

ditto, consumeObject?

299

This needs handling to avoid buffer overrun when the string is not null terminated. I think you should add a helper like this and then use it everywhere you use reinterpret_cast<const char *>:

StringRef consumeCString(ArrayRef<uint8_t> &Data) {
  StringRef Str, Rest;
  std::tie(Str, Rest) = getBytesAsCharacters(Data).split('\0');
  Data = ArrayRef<uint8_t>(reinterpret_cast<const uint8_t*>(Rest.data()), Rest.size());
  return Str;
}

Alternatively, we could treat lack of null termination as an error, but at least truncating is better than running over.

337

This slice should be checked against Data.size() or we'll abort

480

getBytesAsCString

519

getBytesAsCString

582

I agree, splitting this seems useful.

751

Woo, nibble decoding. I think the dumper doesn't even print these because they are so uninteresting in a post 16 bit world.

You should check up front that there are at least (VFEntryCount +1) / 2 bytes in Data, or the slices will abort.

[zturner]

Fix review suggestions, now with full context.

[rnk]

include/llvm/DebugInfo/CodeView/TypeRecord.h

74

Given that you wired up error_code, this should return an error if Data.size() == Str.size(), which implies that there was no null terminator.

83

I think you meant Data.size() < Size :)

274

We probably shouldn't inline all these deserialization methods. We should probably make a TypeRecord.cpp for these.

629

consumeCString

695

consumeCString

792

You should check up front that there are at least (VFEntryCount +1) / 2 bytes in Data, or the slices will abort.

This comment is still relevant. Maybe you could handle it by doing this:

ArrayRef<uint8_t> SlotBytes;
if (auto EC = consumeArray(SlotBytes, Data, (L->VFEntryCount + 1) / 2))
  return EC;
if (L->VFEntryCount % 2 == 1)
  SlotBytes = SlotBytes.drop_back(1); // plus other special handling for that last byte
for (uint8_t Byte : SlotBytes) {
  // handle two nibbles at a time
}

[zturner]

I'm thinking I can move the deserialize methods to a cpp file in a followup, because I want to try reducing the amount of boilerplate with some templates, and it's not clear how that will turn out. If i'm lucky I can get a lot of the deserialize methods to disappear.

[zturner]

BTW, latest patch should address all the concerns.

[rnk]

lgtm with one last fix

include/llvm/DebugInfo/CodeView/TypeRecord.h

695

What about this though?

include/llvm/DebugInfo/CodeView/CVTypeVisitor.h

 //===- CVTypeVisitor.h ------------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_DEBUGINFO_CODEVIEW_CVTYPEVISITOR_H
 #define LLVM_DEBUGINFO_CODEVIEW_CVTYPEVISITOR_H
 
 #include "llvm/DebugInfo/CodeView/CodeView.h"
 #include "llvm/DebugInfo/CodeView/RecordIterator.h"
 #include "llvm/DebugInfo/CodeView/TypeIndex.h"
 #include "llvm/DebugInfo/CodeView/TypeRecord.h"
+#include "llvm/Support/ErrorOr.h"
 
 namespace llvm {
 namespace codeview {
 
 template <typename Derived>
 class CVTypeVisitor {
 public:
   CVTypeVisitor() {}
public:
   }
 
   /// Actions to take on known types. By default, they do nothing. Visit methods
   /// for member records take the FieldData by non-const reference and are
   /// expected to consume the trailing bytes used by the field.
   /// FIXME: Make the visitor interpret the trailing bytes so that clients don't
   /// need to.
 #define TYPE_RECORD(ClassName, LeafEnum)                                       \
-  void visit##ClassName(TypeLeafKind LeafType, const ClassName *Record,        \
-                        ArrayRef<uint8_t> LeafData) {}
+  void visit##ClassName(TypeLeafKind LeafType, ClassName &Record) {}
 #define TYPE_RECORD_ALIAS(ClassName, LeafEnum)
 #define MEMBER_RECORD(ClassName, LeafEnum)                                     \
-  void visit##ClassName(TypeLeafKind LeafType, const ClassName *Record,        \
-                        ArrayRef<uint8_t> &FieldData) {}
+  void visit##ClassName(TypeLeafKind LeafType, ClassName &Record) {}
 #define MEMBER_RECORD_ALIAS(ClassName, LeafEnum)
 #include "TypeRecords.def"
 
   void visitTypeRecord(const TypeIterator::Record &Record) {
     ArrayRef<uint8_t> LeafData = Record.Data;
     ArrayRef<uint8_t> RecordData = LeafData;
     auto *DerivedThis = static_cast<Derived *>(this);
     DerivedThis->visitTypeBegin(Record.Type, RecordData);
     switch (Record.Type) {
     default:
       DerivedThis->visitUnknownType(Record.Type);
       break;
     case LF_FIELDLIST:
       DerivedThis->visitFieldList(Record.Type, LeafData);
       break;
     case LF_METHODLIST:
       DerivedThis->visitMethodList(Record.Type, LeafData);
       break;
 #define TYPE_RECORD(ClassName, LeafEnum)                                       \
   case LeafEnum: {                                                             \
-    const ClassName *Rec;                                                      \
-    if (!CVTypeVisitor::consumeObject(LeafData, Rec))                          \
-      return;                                                                  \
-    DerivedThis->visit##ClassName(Record.Type, Rec, LeafData);                 \
+    TypeRecordKind RK = static_cast<TypeRecordKind>(LeafEnum);                 \
+    auto Result = ClassName::deserialize(RK, LeafData);                        \
+    if (Result.getError())                                                     \
+      return parseError();                                                     \
+    DerivedThis->visit##ClassName(Record.Type, *Result);                       \
     break;                                                                     \
   }
 #include "TypeRecords.def"
       }
       DerivedThis->visitTypeEnd(Record.Type, RecordData);
   }
 
   /// Visits the type records in Data. Sets the error flag on parse failures.
while (!FieldData.empty()) {
       switch (Leaf) {
       default:
         // Field list records do not describe their own length, so we cannot
         // continue parsing past an unknown member type.
         visitUnknownMember(Leaf);
         return parseError();
 #define MEMBER_RECORD(ClassName, LeafEnum)                                     \
   case LeafEnum: {                                                             \
-    const ClassName *Rec;                                                      \
-    if (!CVTypeVisitor::consumeObject(FieldData, Rec))                         \
-      return;                                                                  \
-    static_cast<Derived *>(this)->visit##ClassName(Leaf, Rec, FieldData);      \
+    TypeRecordKind RK = static_cast<TypeRecordKind>(LeafEnum);                 \
+    auto Result = ClassName::deserialize(RK, FieldData);                       \
+    if (Result.getError())                                                     \
+      return parseError();                                                     \
+    static_cast<Derived *>(this)->visit##ClassName(Leaf, *Result);             \
     break;                                                                     \
   }
 #include "TypeRecords.def"
       }
       FieldData = skipPadding(FieldData);
     }
   }
 

include/llvm/DebugInfo/CodeView/CodeView.h

enum class TypeRecordKind : uint16_t {
   Array = 0x1503,
   Class = 0x1504,
   Structure = 0x1505,
   Union = 0x1506,
   Enum = 0x1507,
   Alias = 0x150a,
   Member = 0x150d,
   StaticMember = 0x150e,
-  Method = 0x150f,
+  OverloadedMethod = 0x150f,
   NestedType = 0x1510,
   OneMethod = 0x1511,
+  TypeServer2 = 0x1515,
   VirtualFunctionTable = 0x151d,
 
   FunctionId = 0x1601,
   MemberFunctionId = 0x1602,
   BuildInfo = 0x1603,
   SubstringList = 0x1604,
   StringId = 0x1605,
   UdtSourceLine = 0x1606,

include/llvm/DebugInfo/CodeView/TypeRecord.h

 //===- TypeRecord.h ---------------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_DEBUGINFO_CODEVIEW_TYPERECORD_H
 #define LLVM_DEBUGINFO_CODEVIEW_TYPERECORD_H
 
+#include "llvm/ADT/APSInt.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/DebugInfo/CodeView/CodeView.h"
 #include "llvm/DebugInfo/CodeView/TypeIndex.h"
+#include "llvm/Support/ErrorOr.h"
 #include <cinttypes>
+#include <tuple>
 
 namespace llvm {
 namespace codeview {
 
 using llvm::support::little32_t;
 using llvm::support::ulittle16_t;
 using llvm::support::ulittle32_t;
 
+/// Decodes a numeric "leaf" value. These are integer literals encountered in
+/// the type stream. If the value is positive and less than LF_NUMERIC (1 <<
+/// 15), it is emitted directly in Data. Otherwise, it has a tag like LF_CHAR
+/// that indicates the bitwidth and sign of the numeric data.
+bool decodeNumericLeaf(ArrayRef<uint8_t> &Data, APSInt &Num);
+
+inline bool decodeNumericLeaf(StringRef &Data, APSInt &Num) {
+  ArrayRef<uint8_t> Bytes(reinterpret_cast<const uint8_t *>(Data.data()),
+                          Data.size());
+  bool Success = decodeNumericLeaf(Bytes, Num);
+  Data = StringRef(reinterpret_cast<const char *>(Bytes.data()), Bytes.size());
+  return Success;
+}
+
+/// Decode a numeric leaf value that is known to be a uint32_t.
+bool decodeUIntLeaf(ArrayRef<uint8_t> &Data, uint64_t &Num);
+
+/// Reinterpret a byte array as an array of characters. Does not interpret as
+/// a C string, as StringRef has several helpers (split) that make that easy.
+inline StringRef getBytesAsCharacters(ArrayRef<uint8_t> LeafData) {
+  return StringRef(reinterpret_cast<const char *>(LeafData.data()),
+                   LeafData.size());
+}
+
+inline StringRef getBytesAsCString(ArrayRef<uint8_t> LeafData) {
+  return getBytesAsCharacters(LeafData).split('\0').first;
+}
+
+/// Consumes sizeof(T) bytes from the given byte sequence. Returns an error if
+/// there are not enough bytes remaining. Reinterprets the consumed bytes as a
+/// T object and points 'Res' at them.
+template <typename T, typename U>
+inline std::error_code consumeObject(U &Data, const T *&Res) {
+  if (Data.size() < sizeof(*Res))
+    return std::make_error_code(std::errc::illegal_byte_sequence);
+  Res = reinterpret_cast<const T *>(Data.data());
+  Data = Data.drop_front(sizeof(*Res));
+  return std::error_code();
+}
+
+inline std::error_code consumeCString(ArrayRef<uint8_t> &Data, StringRef &Str) {
+  if (Data.empty())
+    return std::make_error_code(std::errc::illegal_byte_sequence);
+
+  StringRef Rest;
+  std::tie(Str, Rest) = getBytesAsCharacters(Data).split('\0');
+  Data = ArrayRef<uint8_t>(Rest.bytes_begin(), Rest.bytes_end());
+  return std::error_code();
+}
+
+template <typename T>
+inline std::error_code consumeArray(ArrayRef<uint8_t> &Data,
+                                    ArrayRef<T> &Result, uint32_t N) {
+  uint32_t Size = sizeof(T) * N;
+  if (Data.size() < N)
+    return std::make_error_code(std::errc::illegal_byte_sequence);
+
+  Result = ArrayRef<T>(reinterpret_cast<const T *>(Data.data()), N);
+  Data = Data.drop_front(Size);
+  return std::error_code();
+}
+
+inline std::error_code consumeUInt32(StringRef &Data, uint32_t &Res) {
+  const support::ulittle32_t *IntPtr;
+  if (auto EC = consumeObject(Data, IntPtr))
+    return EC;
+  Res = *IntPtr;
+  return std::error_code();
+}
+
+/// Equvalent to CV_fldattr_t in cvinfo.h.
+struct MemberAttributes {
+  ulittle16_t Attrs;
+
+  /// Get the access specifier. Valid for any kind of member.
+  MemberAccess getAccess() const {
+    return MemberAccess(unsigned(Attrs) & unsigned(MethodOptions::AccessMask));
+  }
+
+  /// Indicates if a method is defined with friend, virtual, static, etc.
+  MethodKind getMethodKind() const {
+    return MethodKind(
+        (unsigned(Attrs) & unsigned(MethodOptions::MethodKindMask)) >> 2);
+  }
+
+  /// Get the flags that are not included in access control or method
+  /// properties.
+  MethodOptions getFlags() const {
+    return MethodOptions(
+        unsigned(Attrs) &
+        ~unsigned(MethodOptions::AccessMask | MethodOptions::MethodKindMask));
+  }
+
+  /// Is this method virtual.
+  bool isVirtual() const {
+    auto MP = getMethodKind();
+    return MP != MethodKind::Vanilla && MP != MethodKind::Friend &&
+           MP != MethodKind::Static;
+  }
+
+  /// Does this member introduce a new virtual method.
+  bool isIntroducedVirtual() const {
+    auto MP = getMethodKind();
+    return MP == MethodKind::IntroducingVirtual ||
+           MP == MethodKind::PureIntroducingVirtual;
+  }
+};
+
+// Does not correspond to any tag, this is the tail of an LF_POINTER record
+// if it represents a member pointer.
+class MemberPointerInfo {
+public:
+  MemberPointerInfo() {}
+
+  MemberPointerInfo(TypeIndex ContainingType,
+                    PointerToMemberRepresentation Representation)
+      : ContainingType(ContainingType), Representation(Representation) {}
+
+  static ErrorOr<MemberPointerInfo> deserialize(ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    TypeIndex T = L->ClassType;
+    uint16_t R = L->Representation;
+    PointerToMemberRepresentation PMR =
+        static_cast<PointerToMemberRepresentation>(R);
+    return MemberPointerInfo(T, PMR);
+  }
+
+  TypeIndex getContainingType() const { return ContainingType; }
+  PointerToMemberRepresentation getRepresentation() const {
+    return Representation;
+  }
+
+private:
+  struct Layout {
+    TypeIndex ClassType;
+    ulittle16_t Representation; // PointerToMemberRepresentation
+  };
+
+  TypeIndex ContainingType;
+  PointerToMemberRepresentation Representation;
+};
+
 class TypeRecord {
 protected:
   explicit TypeRecord(TypeRecordKind Kind) : Kind(Kind) {}
 
 public:
   TypeRecordKind getKind() const { return Kind; }
 
 private:
   TypeRecordKind Kind;
 };
 
+// LF_MODIFIER
 class ModifierRecord : public TypeRecord {
 public:
-  ModifierRecord(TypeIndex ModifiedType, ModifierOptions Options)
+  ModifierRecord(TypeIndex ModifiedType, ModifierOptions Modifiers)
       : TypeRecord(TypeRecordKind::Modifier), ModifiedType(ModifiedType),
-        Options(Options) {}
+        Modifiers(Modifiers) {}
+
+  static ErrorOr<ModifierRecord> deserialize(TypeRecordKind Kind,
+                                             ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    TypeIndex M = L->ModifiedType;
+    uint16_t O = L->Modifiers;
+    ModifierOptions MO = static_cast<ModifierOptions>(O);
+    return ModifierRecord(M, MO);
+  }
 
   TypeIndex getModifiedType() const { return ModifiedType; }
-  ModifierOptions getOptions() const { return Options; }
+  ModifierOptions getModifiers() const { return Modifiers; }
 
 private:
+  struct Layout {
+    TypeIndex ModifiedType;
+    ulittle16_t Modifiers; // ModifierOptions
+  };
+
   TypeIndex ModifiedType;
-  ModifierOptions Options;
+  ModifierOptions Modifiers;
 };
 
+// LF_PROCEDURE
 class ProcedureRecord : public TypeRecord {
 public:
   ProcedureRecord(TypeIndex ReturnType, CallingConvention CallConv,
                   FunctionOptions Options, uint16_t ParameterCount,
                   TypeIndex ArgumentList)
       : TypeRecord(TypeRecordKind::Procedure), ReturnType(ReturnType),
         CallConv(CallConv), Options(Options), ParameterCount(ParameterCount),
         ArgumentList(ArgumentList) {}
 
+  static ErrorOr<ProcedureRecord> deserialize(TypeRecordKind Kind,
+                                              ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    return ProcedureRecord(L->ReturnType, L->CallConv, L->Options,
+                           L->NumParameters, L->ArgListType);
+  }
+
+  static uint32_t getLayoutSize() { return 2 + sizeof(Layout); }
+
   TypeIndex getReturnType() const { return ReturnType; }
   CallingConvention getCallConv() const { return CallConv; }
   FunctionOptions getOptions() const { return Options; }
   uint16_t getParameterCount() const { return ParameterCount; }
   TypeIndex getArgumentList() const { return ArgumentList; }
 
 private:
+  struct Layout {
+    TypeIndex ReturnType;
+    CallingConvention CallConv;
+    FunctionOptions Options;
+    ulittle16_t NumParameters;
+    TypeIndex ArgListType;
+  };
+
   TypeIndex ReturnType;
   CallingConvention CallConv;
   FunctionOptions Options;
   uint16_t ParameterCount;
   TypeIndex ArgumentList;
 };
 
+// LF_MFUNCTION
 class MemberFunctionRecord : public TypeRecord {
 public:
   MemberFunctionRecord(TypeIndex ReturnType, TypeIndex ClassType,
                        TypeIndex ThisType, CallingConvention CallConv,
                        FunctionOptions Options, uint16_t ParameterCount,
                        TypeIndex ArgumentList, int32_t ThisPointerAdjustment)
       : TypeRecord(TypeRecordKind::MemberFunction), ReturnType(ReturnType),
         ClassType(ClassType), ThisType(ThisType), CallConv(CallConv),
         Options(Options), ParameterCount(ParameterCount),
         ArgumentList(ArgumentList),
         ThisPointerAdjustment(ThisPointerAdjustment) {}
 
+  static ErrorOr<MemberFunctionRecord> deserialize(TypeRecordKind Kind,
+                                                   ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    return MemberFunctionRecord(L->ReturnType, L->ClassType, L->ThisType,
+                                L->CallConv, L->Options, L->NumParameters,
+                                L->ArgListType, L->ThisAdjustment);
+  }
+
   TypeIndex getReturnType() const { return ReturnType; }
   TypeIndex getClassType() const { return ClassType; }
   TypeIndex getThisType() const { return ThisType; }
   CallingConvention getCallConv() const { return CallConv; }
   FunctionOptions getOptions() const { return Options; }
   uint16_t getParameterCount() const { return ParameterCount; }
   TypeIndex getArgumentList() const { return ArgumentList; }
   int32_t getThisPointerAdjustment() const { return ThisPointerAdjustment; }
 
 private:
+  struct Layout {
+    TypeIndex ReturnType;
+    TypeIndex ClassType;
+    TypeIndex ThisType;
+    CallingConvention CallConv;
+    FunctionOptions Options;
+    ulittle16_t NumParameters;
+    TypeIndex ArgListType;
+    little32_t ThisAdjustment;
+  };
+
   TypeIndex ReturnType;
   TypeIndex ClassType;
   TypeIndex ThisType;
   CallingConvention CallConv;
   FunctionOptions Options;
   uint16_t ParameterCount;
   TypeIndex ArgumentList;
   int32_t ThisPointerAdjustment;
 };
 
-class ArgumentListRecord : public TypeRecord {
+// LF_MFUNC_ID
+class MemberFunctionIdRecord : public TypeRecord {
+public:
+  MemberFunctionIdRecord(TypeIndex ClassType, TypeIndex FunctionType,
+                         StringRef Name)
+      : TypeRecord(TypeRecordKind::MemberFunctionId), ClassType(ClassType),
+        FunctionType(FunctionType), Name(Name) {}
+
+  static ErrorOr<MemberFunctionIdRecord> deserialize(TypeRecordKind Kind,
+                                                     ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    StringRef Name;
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
+    return MemberFunctionIdRecord(L->ClassType, L->FunctionType, Name);
+  }
+
+  TypeIndex getClassType() const { return ClassType; }
+  TypeIndex getFunctionType() const { return FunctionType; }
+  StringRef getName() const { return Name; }
+
+private:
+  struct Layout {
+    TypeIndex ClassType;
+    TypeIndex FunctionType;
+    // Name: The null-terminated name follows.
+  };
+  TypeIndex ClassType;
+  TypeIndex FunctionType;
+  StringRef Name;
+};
+
+// LF_ARGLIST, LF_SUBSTR_LIST
+class StringListRecord : public TypeRecord {
 public:
-  explicit ArgumentListRecord(llvm::ArrayRef<TypeIndex> ArgumentTypes)
-      : TypeRecord(TypeRecordKind::ArgumentList), ArgumentTypes(ArgumentTypes) {
+  StringListRecord(TypeRecordKind Kind, ArrayRef<TypeIndex> Indices)
+      : TypeRecord(Kind), StringIndices(Indices) {}
+
+  static ErrorOr<StringListRecord> deserialize(TypeRecordKind Kind,
+                                               ArrayRef<uint8_t> &Data) {
+    if (Kind != TypeRecordKind::SubstringList &&
+        Kind != TypeRecordKind::ArgumentList)
+      return std::make_error_code(std::errc::illegal_byte_sequence);
+
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    ArrayRef<TypeIndex> Indices;
+    if (auto EC = consumeArray(Data, Indices, L->NumArgs))
+      return EC;
+    return StringListRecord(Kind, Indices);
   }
 
-  llvm::ArrayRef<TypeIndex> getArgumentTypes() const { return ArgumentTypes; }
+  ArrayRef<TypeIndex> getIndices() const { return StringIndices; }
+
+  static uint32_t getLayoutSize() { return 2 + sizeof(Layout); }
 
 private:
-  llvm::ArrayRef<TypeIndex> ArgumentTypes;
+  struct Layout {
+    ulittle32_t NumArgs; // Number of arguments
+                         // ArgTypes[]: Type indicies of arguments
   };
 
-class PointerRecordBase : public TypeRecord {
+  ArrayRef<TypeIndex> StringIndices;
+};
+
+// LF_POINTER
+class PointerRecord : public TypeRecord {
 public:
-  PointerRecordBase(TypeIndex ReferentType, PointerKind Kind, PointerMode Mode,
-                    PointerOptions Options, uint8_t Size)
+  static const uint32_t PointerKindShift = 0;
+  static const uint32_t PointerKindMask = 0x1F;
+
+  static const uint32_t PointerModeShift = 5;
+  static const uint32_t PointerModeMask = 0x07;
+
+  static const uint32_t PointerSizeShift = 13;
+  static const uint32_t PointerSizeMask = 0xFF;
+
+  PointerRecord(TypeIndex ReferentType, PointerKind Kind, PointerMode Mode,
+      : PointerRecord(ReferentType, Kind, Mode, Options, Size,
+                      MemberPointerInfo()) {}
+
+  PointerRecord(TypeIndex ReferentType, PointerKind Kind, PointerMode Mode,
+                PointerOptions Options, uint8_t Size,
+                const MemberPointerInfo &Member)
       : TypeRecord(TypeRecordKind::Pointer), ReferentType(ReferentType),
-        PtrKind(Kind), Mode(Mode), Options(Options), Size(Size) {}
+        PtrKind(Kind), Mode(Mode), Options(Options), Size(Size),
+        MemberInfo(Member) {}
+
+  static ErrorOr<PointerRecord> deserialize(TypeRecordKind Kind,
+                                            ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    PointerKind PtrKind = L->getPtrKind();
+    PointerMode Mode = L->getPtrMode();
+    uint32_t Opts = L->Attrs;
+    PointerOptions Options = static_cast<PointerOptions>(Opts);
+    uint8_t Size = L->getPtrSize();
+
+    if (L->isPointerToMember()) {
+      auto E = MemberPointerInfo::deserialize(Data);
+      if (E.getError())
+        return std::make_error_code(std::errc::illegal_byte_sequence);
+      return PointerRecord(L->PointeeType, PtrKind, Mode, Options, Size, *E);
+    }
+
+    return PointerRecord(L->PointeeType, PtrKind, Mode, Options, Size);
+  }
 
   TypeIndex getReferentType() const { return ReferentType; }
   PointerKind getPointerKind() const { return PtrKind; }
   PointerMode getMode() const { return Mode; }
   PointerOptions getOptions() const { return Options; }
   uint8_t getSize() const { return Size; }
+  MemberPointerInfo getMemberInfo() const { return MemberInfo; }
+
+  bool isPointerToMember() const {
+    return Mode == PointerMode::PointerToDataMember ||
+           Mode == PointerMode::PointerToMemberFunction;
+  }
+  bool isFlat() const {
+    return !!(uint32_t(Options) & uint32_t(PointerOptions::Flat32));
+  }
+  bool isConst() const {
+    return !!(uint32_t(Options) & uint32_t(PointerOptions::Const));
+  }
+  bool isVolatile() const {
+    return !!(uint32_t(Options) & uint32_t(PointerOptions::Volatile));
+  }
+  bool isUnaligned() const {
+    return !!(uint32_t(Options) & uint32_t(PointerOptions::Unaligned));
+  }
 
 private:
+  struct Layout {
+    TypeIndex PointeeType;
+    ulittle32_t Attrs; // pointer attributes
+                       // if pointer to member:
+                       //   PointerToMemberTail
+    PointerKind getPtrKind() const {
+      return PointerKind(Attrs & PointerKindMask);
+    }
+    PointerMode getPtrMode() const {
+      return PointerMode((Attrs >> PointerModeShift) & PointerModeMask);
+    }
+    uint8_t getPtrSize() const {
+      return (Attrs >> PointerSizeShift) & PointerSizeMask;
+    }
+    bool isFlat() const { return Attrs & (1 << 8); }
+    bool isVolatile() const { return Attrs & (1 << 9); }
+    bool isConst() const { return Attrs & (1 << 10); }
+    bool isUnaligned() const { return Attrs & (1 << 11); }
+
+    bool isPointerToDataMember() const {
+      return getPtrMode() == PointerMode::PointerToDataMember;
+    }
+    bool isPointerToMemberFunction() const {
+      return getPtrMode() == PointerMode::PointerToMemberFunction;
+    }
+    bool isPointerToMember() const {
+      return isPointerToMemberFunction() || isPointerToDataMember();
+    }
+  };
+
   TypeIndex ReferentType;
   PointerKind PtrKind;
   PointerMode Mode;
   PointerOptions Options;
   uint8_t Size;
+  MemberPointerInfo MemberInfo;
 };
 
-class PointerRecord : public PointerRecordBase {
+// LF_NESTTYPE
+class NestedTypeRecord : public TypeRecord {
 public:
-  PointerRecord(TypeIndex ReferentType, PointerKind Kind, PointerMode Mode,
-                PointerOptions Options, uint8_t Size)
-      : PointerRecordBase(ReferentType, Kind, Mode, Options, Size) {}
-};
+  NestedTypeRecord(TypeIndex Type, StringRef Name)
+      : TypeRecord(TypeRecordKind::NestedType), Type(Type), Name(Name) {}
 
-class PointerToMemberRecord : public PointerRecordBase {
-public:
-  PointerToMemberRecord(TypeIndex ReferentType, PointerKind Kind,
-                        PointerMode Mode, PointerOptions Options, uint8_t Size,
-                        TypeIndex ContainingType,
-                        PointerToMemberRepresentation Representation)
-      : PointerRecordBase(ReferentType, Kind, Mode, Options, Size),
-        ContainingType(ContainingType), Representation(Representation) {}
+  static ErrorOr<NestedTypeRecord> deserialize(TypeRecordKind Kind,
+                                               ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
 
-  TypeIndex getContainingType() const { return ContainingType; }
-  PointerToMemberRepresentation getRepresentation() const {
-    return Representation;
+    StringRef Name;
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
+    return NestedTypeRecord(L->Type, Name);
   }
 
+  TypeIndex getNestedType() const { return Type; }
+  StringRef getName() const { return Name; }
+
 private:
-  TypeIndex ContainingType;
-  PointerToMemberRepresentation Representation;
+  struct Layout {
+    ulittle16_t Pad0; // Should be zero
+    TypeIndex Type;   // Type index of nested type
+                      // Name: Null-terminated string
   };
 
+  TypeIndex Type;
+  StringRef Name;
+};
+
+// LF_ARRAY
 class ArrayRecord : public TypeRecord {
 public:
   ArrayRecord(TypeIndex ElementType, TypeIndex IndexType, uint64_t Size,
-              llvm::StringRef Name)
+              StringRef Name)
       : TypeRecord(TypeRecordKind::Array), ElementType(ElementType),
         IndexType(IndexType), Size(Size), Name(Name) {}
 
+  static ErrorOr<ArrayRecord> deserialize(TypeRecordKind Kind,
+                                          ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    uint64_t Size;
+    if (!decodeUIntLeaf(Data, Size))
+      return std::make_error_code(std::errc::illegal_byte_sequence);
+    StringRef Name;
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
+    return ArrayRecord(L->ElementType, L->IndexType, Size, Name);
+  }
+
   TypeIndex getElementType() const { return ElementType; }
   TypeIndex getIndexType() const { return IndexType; }
   uint64_t getSize() const { return Size; }
   llvm::StringRef getName() const { return Name; }
 
 private:
+  struct Layout {
+    TypeIndex ElementType;
+    TypeIndex IndexType;
+    // SizeOf: LF_NUMERIC encoded size in bytes. Not element count!
+    // Name: The null-terminated name follows.
+  };
+
   TypeIndex ElementType;
   TypeIndex IndexType;
   uint64_t Size;
   llvm::StringRef Name;
 };
 
 class TagRecord : public TypeRecord {
 protected:
   TagRecord(TypeRecordKind Kind, uint16_t MemberCount, ClassOptions Options,
             TypeIndex FieldList, StringRef Name, StringRef UniqueName)
       : TypeRecord(Kind), MemberCount(MemberCount), Options(Options),
         FieldList(FieldList), Name(Name), UniqueName(UniqueName) {}
 
 public:
+  static const int HfaKindShift = 11;
+  static const int HfaKindMask = 0x1800;
+  static const int WinRTKindShift = 14;
+  static const int WinRTKindMask = 0xC000;
+
   uint16_t getMemberCount() const { return MemberCount; }
   ClassOptions getOptions() const { return Options; }
   TypeIndex getFieldList() const { return FieldList; }
   StringRef getName() const { return Name; }
   StringRef getUniqueName() const { return UniqueName; }
 
 private:
   uint16_t MemberCount;
   ClassOptions Options;
   TypeIndex FieldList;
   StringRef Name;
   StringRef UniqueName;
 };
 
-class AggregateRecord : public TagRecord {
+// LF_CLASS, LF_STRUCTURE, LF_INTERFACE
+class ClassRecord : public TagRecord {
 public:
-  AggregateRecord(TypeRecordKind Kind, uint16_t MemberCount,
-                  ClassOptions Options, HfaKind Hfa,
-                  WindowsRTClassKind WinRTKind, TypeIndex FieldList,
-                  TypeIndex DerivationList, TypeIndex VTableShape,
-                  uint64_t Size, StringRef Name, StringRef UniqueName)
+  ClassRecord(TypeRecordKind Kind, uint16_t MemberCount, ClassOptions Options,
+              HfaKind Hfa, WindowsRTClassKind WinRTKind, TypeIndex FieldList,
+              TypeIndex DerivationList, TypeIndex VTableShape, uint64_t Size,
+              StringRef Name, StringRef UniqueName)
       : TagRecord(Kind, MemberCount, Options, FieldList, Name, UniqueName),
         Hfa(Hfa), WinRTKind(WinRTKind), DerivationList(DerivationList),
         VTableShape(VTableShape), Size(Size) {}
 
+  static ErrorOr<ClassRecord> deserialize(TypeRecordKind Kind,
+                                          ArrayRef<uint8_t> &Data) {
+    uint64_t Size = 0;
+    StringRef Name;
+    StringRef UniqueName;
+    uint16_t Props;
+
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    Props = L->Properties;
+    uint16_t WrtValue = (Props & WinRTKindMask) >> WinRTKindShift;
+    WindowsRTClassKind WRT = static_cast<WindowsRTClassKind>(WrtValue);
+    uint16_t HfaMask = (Props & HfaKindMask) >> HfaKindShift;
+    HfaKind Hfa = static_cast<HfaKind>(HfaMask);
+
+    if (!decodeUIntLeaf(Data, Size))
+      return std::make_error_code(std::errc::illegal_byte_sequence);
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
+    if (Props & uint16_t(ClassOptions::HasUniqueName)) {
+      UniqueName = StringRef(reinterpret_cast<const char *>(Data.data()));
+      Data = Data.slice(UniqueName.size() + 1);
+      if (UniqueName.empty())
+        return std::make_error_code(std::errc::illegal_byte_sequence);
+    }
+
+    ClassOptions Options = static_cast<ClassOptions>(Props);
+    return ClassRecord(Kind, L->MemberCount, Options, Hfa, WRT, L->FieldList,
+                       L->DerivedFrom, L->VShape, Size, Name, UniqueName);
+  }
+
   HfaKind getHfa() const { return Hfa; }
   WindowsRTClassKind getWinRTKind() const { return WinRTKind; }
   TypeIndex getDerivationList() const { return DerivationList; }
   TypeIndex getVTableShape() const { return VTableShape; }
   uint64_t getSize() const { return Size; }
 
 private:
+  struct Layout {
+    ulittle16_t MemberCount; // Number of members in FieldList.
+    ulittle16_t Properties;  // ClassOptions bitset
+    TypeIndex FieldList;     // LF_FIELDLIST: List of all kinds of members
+    TypeIndex DerivedFrom;   // LF_DERIVED: List of known derived classes
+    TypeIndex VShape;        // LF_VTSHAPE: Shape of the vftable
+    // SizeOf: The 'sizeof' the UDT in bytes is encoded as an LF_NUMERIC
+    // integer.
+    // Name: The null-terminated name follows.
+  };
+
   HfaKind Hfa;
   WindowsRTClassKind WinRTKind;
   TypeIndex DerivationList;
   TypeIndex VTableShape;
   uint64_t Size;
 };
 
+// LF_UNION
+struct UnionRecord : public TagRecord {
+  UnionRecord(uint16_t MemberCount, ClassOptions Options, HfaKind Hfa,
+              TypeIndex FieldList, uint64_t Size, StringRef Name,
+              StringRef UniqueName)
+      : TagRecord(TypeRecordKind::Union, MemberCount, Options, FieldList, Name,
+                  UniqueName),
+        Hfa(Hfa), Size(Size) {}
+
+  static ErrorOr<UnionRecord> deserialize(TypeRecordKind Kind,
+                                          ArrayRef<uint8_t> &Data) {
+    uint64_t Size = 0;
+    StringRef Name;
+    StringRef UniqueName;
+    uint16_t Props;
+
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    Props = L->Properties;
+
+    uint16_t HfaMask = (Props & HfaKindMask) >> HfaKindShift;
+    HfaKind Hfa = static_cast<HfaKind>(HfaMask);
+
+    if (!decodeUIntLeaf(Data, Size))
+      return std::make_error_code(std::errc::illegal_byte_sequence);
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
+    if (Props & uint16_t(ClassOptions::HasUniqueName)) {
+      UniqueName = StringRef(reinterpret_cast<const char *>(Data.data()));
+      Data = Data.slice(UniqueName.size() + 1);
+      if (UniqueName.empty())
+        return std::make_error_code(std::errc::illegal_byte_sequence);
+    }
+
+    ClassOptions Options = static_cast<ClassOptions>(Props);
+    return UnionRecord(L->MemberCount, Options, Hfa, L->FieldList, Size, Name,
+                       UniqueName);
+  }
+
+  HfaKind getHfa() const { return Hfa; }
+  uint64_t getSize() const { return Size; }
+
+private:
+  struct Layout {
+    ulittle16_t MemberCount; // Number of members in FieldList.
+    ulittle16_t Properties;  // ClassOptions bitset
+    TypeIndex FieldList;     // LF_FIELDLIST: List of all kinds of members
+    // SizeOf: The 'sizeof' the UDT in bytes is encoded as an LF_NUMERIC
+    // integer.
+    // Name: The null-terminated name follows.
+  };
+
+  HfaKind Hfa;
+  uint64_t Size;
+};
+
+// LF_ENUM
 class EnumRecord : public TagRecord {
 public:
   EnumRecord(uint16_t MemberCount, ClassOptions Options, TypeIndex FieldList,
              StringRef Name, StringRef UniqueName, TypeIndex UnderlyingType)
       : TagRecord(TypeRecordKind::Enum, MemberCount, Options, FieldList, Name,
                   UniqueName),
         UnderlyingType(UnderlyingType) {}
 
+  static ErrorOr<EnumRecord> deserialize(TypeRecordKind Kind,
+                                         ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    uint16_t P = L->Properties;
+    ClassOptions Options = static_cast<ClassOptions>(P);
+    StringRef Name;
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
+    return EnumRecord(L->NumEnumerators, Options, L->FieldListType, Name, Name,
+                      L->UnderlyingType);
+  }
+
   TypeIndex getUnderlyingType() const { return UnderlyingType; }
 
 private:
+  struct Layout {
+    ulittle16_t NumEnumerators; // Number of enumerators
+    ulittle16_t Properties;
+    TypeIndex UnderlyingType;
+    TypeIndex FieldListType;
+    // Name: The null-terminated name follows.
+  };
+
   TypeIndex UnderlyingType;
 };
 
 class BitFieldRecord : TypeRecord {
 public:
   BitFieldRecord(TypeIndex Type, uint8_t BitSize, uint8_t BitOffset)
       : TypeRecord(TypeRecordKind::BitField), Type(Type), BitSize(BitSize),
         BitOffset(BitOffset) {}
 
   TypeIndex getType() const { return Type; }
   uint8_t getBitOffset() const { return BitOffset; }
   uint8_t getBitSize() const { return BitSize; }
 
 private:
   TypeIndex Type;
   uint8_t BitSize;
   uint8_t BitOffset;
 };
 
+// LF_VTSHAPE
 class VirtualTableShapeRecord : TypeRecord {
 public:
   explicit VirtualTableShapeRecord(ArrayRef<VirtualTableSlotKind> Slots)
+      : TypeRecord(TypeRecordKind::VirtualTableShape), SlotsRef(Slots) {}
+  explicit VirtualTableShapeRecord(std::vector<VirtualTableSlotKind> Slots)
       : TypeRecord(TypeRecordKind::VirtualTableShape), Slots(Slots) {}
 
-  ArrayRef<VirtualTableSlotKind> getSlots() const { return Slots; }
+  static ErrorOr<VirtualTableShapeRecord> deserialize(TypeRecordKind Kind,
+                                                      ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    std::vector<VirtualTableSlotKind> Slots;
+    for (int I = 0; I < L->VFEntryCount; ++I) {
+      if (Data.empty())
+        return std::make_error_code(std::errc::illegal_byte_sequence);
+
+      uint8_t Value = 0;
+      if (I % 2 == 0)
+        Value = Data[0] & 0x0F;
+      else {
+        Value = (Data[0] & 0xF0) >> 4;
+        Data = Data.slice(1);
+      }
+      Slots.push_back(static_cast<VirtualTableSlotKind>(Value));
+    }
+    if (L->VFEntryCount % 2 != 0)
+      Data = Data.slice(1);
+    return VirtualTableShapeRecord(Slots);
+  }
+
+  ArrayRef<VirtualTableSlotKind> getSlots() const {
+    if (!SlotsRef.empty())
+      return SlotsRef;
+    return Slots;
+  }
+  uint32_t getEntryCount() const { return getSlots().size(); }
 
 private:
-  ArrayRef<VirtualTableSlotKind> Slots;
+  struct Layout {
+    // Number of vftable entries. Each method may have more than one entry due
+    // to
+    // things like covariant return types.
+    ulittle16_t VFEntryCount;
+    // Descriptors[]: 4-bit virtual method descriptors of type CV_VTS_desc_e.
   };
 
-//===----------------------------------------------------------------------===//
-// On-disk representation of type information
-
-// A CodeView type stream is a sequence of TypeRecords. Records larger than
-// 65536 must chain on to a second record. Each TypeRecord is followed by one of
-// the leaf types described below.
+private:
+  ArrayRef<VirtualTableSlotKind> SlotsRef;
+  std::vector<VirtualTableSlotKind> Slots;
+};
 
 // LF_TYPESERVER2
-struct TypeServer2 {
-  char Signature[16];  // GUID
+class TypeServer2Record : TypeRecord {
+public:
+  TypeServer2Record(StringRef Guid, uint32_t Age, StringRef Name)
+      : TypeRecord(TypeRecordKind::TypeServer2), Guid(Guid), Age(Age),
+        Name(Name) {}
+
+  static ErrorOr<TypeServer2Record> deserialize(TypeRecordKind Kind,
+                                                ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    StringRef Name;
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
+    return TypeServer2Record(StringRef(L->Guid, 16), L->Age, Name);
+  }
+
+  StringRef getGuid() const { return Guid; }
+
+  uint32_t getAge() const { return Age; }
+
+  StringRef getName() const { return Name; }
+
+private:
+  struct Layout {
+    char Guid[16]; // GUID
     ulittle32_t Age;
     // Name: Name of the PDB as a null-terminated string
   };
 
-// LF_STRING_ID
-struct StringId {
-  TypeIndex id;
+  StringRef Guid;
+  uint32_t Age;
+  StringRef Name;
 };
 
-// LF_FUNC_ID
-struct FuncId {
-  TypeIndex ParentScope;
-  TypeIndex FunctionType;
-  // Name: The null-terminated name follows.
-};
+// LF_STRING_ID
+class StringIdRecord : public TypeRecord {
+public:
+  StringIdRecord(TypeIndex Id, StringRef String)
+      : TypeRecord(TypeRecordKind::StringId), Id(Id), String(String) {}
 
-// LF_CLASS, LF_STRUCTURE, LF_INTERFACE
-struct ClassType {
-  ulittle16_t MemberCount; // Number of members in FieldList.
-  ulittle16_t Properties;  // ClassOptions bitset
-  TypeIndex FieldList;     // LF_FIELDLIST: List of all kinds of members
-  TypeIndex DerivedFrom;   // LF_DERIVED: List of known derived classes
-  TypeIndex VShape;        // LF_VTSHAPE: Shape of the vftable
-  // SizeOf: The 'sizeof' the UDT in bytes is encoded as an LF_NUMERIC integer.
-  // Name: The null-terminated name follows.
+  static ErrorOr<StringIdRecord> deserialize(TypeRecordKind Kind,
+                                             ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    StringRef Name;
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
+    return StringIdRecord(L->id, Name);
+  }
+
+  TypeIndex getId() const { return Id; }
+
+  StringRef getString() const { return String; }
+
+private:
+  struct Layout {
+    TypeIndex id;
+    // Name: Name of the PDB as a null-terminated string
   };
 
-// LF_UNION
-struct UnionType {
-  ulittle16_t MemberCount; // Number of members in FieldList.
-  ulittle16_t Properties;  // ClassOptions bitset
-  TypeIndex FieldList;     // LF_FIELDLIST: List of all kinds of members
-  // SizeOf: The 'sizeof' the UDT in bytes is encoded as an LF_NUMERIC integer.
-  // Name: The null-terminated name follows.
+  TypeIndex Id;
+  StringRef String;
 };
 
-// LF_POINTER
-struct PointerType {
-  TypeIndex PointeeType;
-  ulittle32_t Attrs; // pointer attributes
-  // if pointer to member:
-  //   PointerToMemberTail
+// LF_FUNC_ID
+class FuncIdRecord : public TypeRecord {
+public:
+  FuncIdRecord(TypeIndex ParentScope, TypeIndex FunctionType, StringRef Name)
+      : TypeRecord(TypeRecordKind::FunctionId), ParentScope(ParentScope),
+        FunctionType(FunctionType), Name(Name) {}
+
+  static ErrorOr<FuncIdRecord> deserialize(TypeRecordKind Kind,
+                                           ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
 
-  PointerKind getPtrKind() const { return PointerKind(Attrs & 0x1f); }
-  PointerMode getPtrMode() const { return PointerMode((Attrs >> 5) & 0x07); }
-  bool isFlat() const { return Attrs & (1 << 8); }
-  bool isVolatile() const { return Attrs & (1 << 9); }
-  bool isConst() const { return Attrs & (1 << 10); }
-  bool isUnaligned() const { return Attrs & (1 << 11); }
+    StringRef Name;
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
 
-  bool isPointerToDataMember() const {
-    return getPtrMode() == PointerMode::PointerToDataMember;
+    return FuncIdRecord(L->ParentScope, L->FunctionType, Name);
   }
-  bool isPointerToMemberFunction() const {
-    return getPtrMode() == PointerMode::PointerToMemberFunction;
-  }
-  bool isPointerToMember() const {
-    return isPointerToMemberFunction() || isPointerToDataMember();
-  }
-};
 
-struct PointerToMemberTail {
-  TypeIndex ClassType;
-  ulittle16_t Representation; // PointerToMemberRepresentation
-};
+  TypeIndex getParentScope() const { return ParentScope; }
 
-/// In Clang parlance, these are "qualifiers".  LF_MODIFIER
-struct TypeModifier {
-  TypeIndex ModifiedType;
-  ulittle16_t Modifiers; // ModifierOptions
+  TypeIndex getFunctionType() const { return FunctionType; }
+
+  StringRef getName() const { return Name; }
+
+private:
+  struct Layout {
+    TypeIndex ParentScope;
+    TypeIndex FunctionType;
+    // Name: The null-terminated name follows.
   };
 
-// LF_VTSHAPE
-struct VTableShape {
-  // Number of vftable entries. Each method may have more than one entry due to
-  // things like covariant return types.
-  ulittle16_t VFEntryCount;
-  // Descriptors[]: 4-bit virtual method descriptors of type CV_VTS_desc_e.
+  TypeIndex ParentScope;
+  TypeIndex FunctionType;
+  StringRef Name;
 };
 
 // LF_UDT_SRC_LINE
-struct UDTSrcLine {
+class UdtSourceLineRecord : public TypeRecord {
+public:
+  UdtSourceLineRecord(TypeIndex UDT, TypeIndex SourceFile, uint32_t LineNumber)
+      : TypeRecord(TypeRecordKind::UdtSourceLine), UDT(UDT),
+        SourceFile(SourceFile), LineNumber(LineNumber) {}
+
+  static ErrorOr<UdtSourceLineRecord> deserialize(TypeRecordKind Kind,
+                                                  ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    return UdtSourceLineRecord(L->UDT, L->SourceFile, L->LineNumber);
+  }
+
+  TypeIndex getUDT() const { return UDT; }
+  TypeIndex getSourceFile() const { return SourceFile; }
+  uint32_t getLineNumber() const { return LineNumber; }
+
+private:
+  struct Layout {
     TypeIndex UDT;        // The user-defined type
     TypeIndex SourceFile; // StringID containing the source filename
     ulittle32_t LineNumber;
   };
 
-// LF_ARGLIST, LF_SUBSTR_LIST
-struct ArgList {
-  ulittle32_t NumArgs; // Number of arguments
-  // ArgTypes[]: Type indicies of arguments
+  TypeIndex UDT;
+  TypeIndex SourceFile;
+  uint32_t LineNumber;
 };
 
 // LF_BUILDINFO
-struct BuildInfo {
+class BuildInfoRecord : public TypeRecord {
+public:
+  BuildInfoRecord(ArrayRef<TypeIndex> ArgIndices)
+      : TypeRecord(TypeRecordKind::Modifier), ArgIndices(ArgIndices) {}
+
+  static ErrorOr<BuildInfoRecord> deserialize(TypeRecordKind Kind,
+                                              ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    ArrayRef<TypeIndex> Indices;
+    if (auto EC = consumeArray(Data, Indices, L->NumArgs))
+      return EC;
+    return BuildInfoRecord(Indices);
+  }
+
+  ArrayRef<TypeIndex> getArgs() const { return ArgIndices; }
+
+private:
+  struct Layout {
     ulittle16_t NumArgs; // Number of arguments
                          // ArgTypes[]: Type indicies of arguments
   };
-
-// LF_ENUM
-struct EnumType {
-  ulittle16_t NumEnumerators; // Number of enumerators
-  ulittle16_t Properties;
-  TypeIndex UnderlyingType;
-  TypeIndex FieldListType;
-  // Name: The null-terminated name follows.
-};
-
-// LF_ARRAY
-struct ArrayType {
-  TypeIndex ElementType;
-  TypeIndex IndexType;
-  // SizeOf: LF_NUMERIC encoded size in bytes. Not element count!
-  // Name: The null-terminated name follows.
+  ArrayRef<TypeIndex> ArgIndices;
 };
 
 // LF_VFTABLE
-struct VFTableType {
+class VirtualTableRecord : public TypeRecord {
+public:
+  VirtualTableRecord(TypeIndex CompleteClass, TypeIndex OverriddenVFTable,
+                     uint32_t VFPtrOffset, StringRef Name,
+                     ArrayRef<StringRef> Methods)
+      : TypeRecord(TypeRecordKind::VirtualFunctionTable),
+        CompleteClass(CompleteClass), OverriddenVFTable(OverriddenVFTable),
+        VFPtrOffset(VFPtrOffset), Name(Name), MethodNamesRef(Methods) {}
+  VirtualTableRecord(TypeIndex CompleteClass, TypeIndex OverriddenVFTable,
+                     uint32_t VFPtrOffset, StringRef Name,
+                     const std::vector<StringRef> &Methods)
+      : TypeRecord(TypeRecordKind::VirtualFunctionTable),
+        CompleteClass(CompleteClass), OverriddenVFTable(OverriddenVFTable),
+        VFPtrOffset(VFPtrOffset), Name(Name), MethodNames(Methods) {}
+
+  static ErrorOr<VirtualTableRecord> deserialize(TypeRecordKind Kind,
+                                                 ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    StringRef Name;
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
+
+    std::vector<StringRef> Names;
+    while (!Data.empty()) {
+      if (auto EC = consumeCString(Data, Name))
+        return EC;
+      Names.push_back(Name);
+    }
+    return VirtualTableRecord(L->CompleteClass, L->OverriddenVFTable,
+                              L->VFPtrOffset, Name, Names);
+  }
+
+  TypeIndex getCompleteClass() const { return CompleteClass; }
+  TypeIndex getOverriddenVTable() const { return OverriddenVFTable; }
+  uint32_t getVFPtrOffset() const { return VFPtrOffset; }
+  StringRef getName() const { return Name; }
+  ArrayRef<StringRef> getMethodNames() const {
+    if (!MethodNamesRef.empty())
+      return MethodNamesRef;
+    return MethodNames;
+  }
+
+private:
+  struct Layout {
     TypeIndex CompleteClass;     // Class that owns this vftable.
     TypeIndex OverriddenVFTable; // VFTable that this overrides.
     ulittle32_t VFPtrOffset;     // VFPtr offset in CompleteClass
     ulittle32_t NamesLen;        // Length of subsequent names array in bytes.
     // Names: A sequence of null-terminated strings. First string is vftable
     // names.
   };
 
-// LF_MFUNC_ID
-struct MemberFuncId {
-  TypeIndex ClassType;
-  TypeIndex FunctionType;
-  // Name: The null-terminated name follows.
-};
-
-// LF_PROCEDURE
-struct ProcedureType {
-  TypeIndex ReturnType;
-  CallingConvention CallConv;
-  FunctionOptions Options;
-  ulittle16_t NumParameters;
-  TypeIndex ArgListType;
-};
-
-// LF_MFUNCTION
-struct MemberFunctionType {
-  TypeIndex ReturnType;
-  TypeIndex ClassType;
-  TypeIndex ThisType;
-  CallingConvention CallConv;
-  FunctionOptions Options;
-  ulittle16_t NumParameters;
-  TypeIndex ArgListType;
-  little32_t ThisAdjustment;
+  TypeIndex CompleteClass;
+  TypeIndex OverriddenVFTable;
+  ulittle32_t VFPtrOffset;
+  StringRef Name;
+  ArrayRef<StringRef> MethodNamesRef;
+  std::vector<StringRef> MethodNames;
 };
 
-//===----------------------------------------------------------------------===//
-// Field list records, which do not include leafs or sizes
-
-/// Equvalent to CV_fldattr_t in cvinfo.h.
-struct MemberAttributes {
-  ulittle16_t Attrs;
-
-  /// Get the access specifier. Valid for any kind of member.
-  MemberAccess getAccess() const {
-    return MemberAccess(unsigned(Attrs) & unsigned(MethodOptions::AccessMask));
+// LF_ONEMETHOD
+class OneMethodRecord : public TypeRecord {
+public:
+  OneMethodRecord(TypeIndex Type, MethodKind Kind, MethodOptions Options,
+                  MemberAccess Access, int32_t VFTableOffset, StringRef Name)
+      : TypeRecord(TypeRecordKind::OneMethod), Type(Type), Kind(Kind),
+        Options(Options), Access(Access), VFTableOffset(VFTableOffset),
+        Name(Name) {}
+
+  static ErrorOr<OneMethodRecord> deserialize(TypeRecordKind Kind,
+                                              ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    MethodOptions Options = L->Attrs.getFlags();
+    MethodKind MethKind = L->Attrs.getMethodKind();
+    MemberAccess Access = L->Attrs.getAccess();
+    int32_t VFTableOffset = 0;
+    if (L->Attrs.isIntroducedVirtual()) {
+      const little32_t *L;
+      if (consumeObject(Data, L))
+        return std::make_error_code(std::errc::illegal_byte_sequence);
+      VFTableOffset = *L;
     }
+    StringRef Name;
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
 
-  /// Indicates if a method is defined with friend, virtual, static, etc.
-  MethodKind getMethodKind() const {
-    return MethodKind(
-        (unsigned(Attrs) & unsigned(MethodOptions::MethodKindMask)) >> 2);
+    return OneMethodRecord(L->Type, MethKind, Options, Access, VFTableOffset,
+                           Name);
   }
 
-  /// Get the flags that are not included in access control or method
-  /// properties.
-  MethodOptions getFlags() const {
-    return MethodOptions(
-        unsigned(Attrs) &
-        ~unsigned(MethodOptions::AccessMask | MethodOptions::MethodKindMask));
-  }
+  TypeIndex getType() const { return Type; }
+  MethodKind getKind() const { return Kind; }
+  MethodOptions getOptions() const { return Options; }
+  MemberAccess getAccess() const { return Access; }
+  int32_t getVFTableOffset() const { return VFTableOffset; }
+  StringRef getName() const { return Name; }
 
-  /// Is this method virtual.
-  bool isVirtual() const {
-    auto MP = getMethodKind();
-    return MP != MethodKind::Vanilla && MP != MethodKind::Friend &&
-           MP != MethodKind::Static;
+  bool isIntroducingVirtual() const {
+    const uint8_t K = static_cast<uint8_t>(Kind);
+    const uint8_t V = static_cast<uint8_t>(MethodKind::IntroducingVirtual);
+    const uint8_t PV = static_cast<uint8_t>(MethodKind::PureIntroducingVirtual);
+    return (K & V) || (K & PV);
   }
 
-  /// Does this member introduce a new virtual method.
-  bool isIntroducedVirtual() const {
-    auto MP = getMethodKind();
-    return MP == MethodKind::IntroducingVirtual ||
-           MP == MethodKind::PureIntroducingVirtual;
-  }
-};
-
-// LF_NESTTYPE
-struct NestedType {
-  ulittle16_t Pad0; // Should be zero
-  TypeIndex Type;   // Type index of nested type
-  // Name: Null-terminated string
-};
-
-// LF_ONEMETHOD
-struct OneMethod {
+private:
+  struct Layout {
     MemberAttributes Attrs;
     TypeIndex Type;
     // If is introduced virtual method:
     //   VFTableOffset: int32_t offset in vftable
     // Name: Null-terminated string
+  };
 
-  MethodKind getMethodKind() const {
-    return Attrs.getMethodKind();
-  }
-
-  bool isVirtual() const { return Attrs.isVirtual(); }
-  bool isIntroducedVirtual() const { return Attrs.isIntroducedVirtual(); }
+  TypeIndex Type;
+  MethodKind Kind;
+  MethodOptions Options;
+  MemberAccess Access;
+  int32_t VFTableOffset;
+  StringRef Name;
 };
 
 // LF_METHODLIST
-struct MethodListEntry {
+class MethodListRecord : public TypeRecord {
+public:
+  MethodListRecord(TypeIndex Type, MethodKind Kind, MethodOptions Options,
+                   MemberAccess Access, int32_t VFTableOffset)
+      : TypeRecord(TypeRecordKind::MethodList), Type(Type), Kind(Kind),
+        Options(Options), Access(Access), VFTableOffset(VFTableOffset) {}
+
+  static ErrorOr<MethodListRecord> deserialize(TypeRecordKind Kind,
+                                               ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    MethodOptions Options = L->Attrs.getFlags();
+    MethodKind MethKind = L->Attrs.getMethodKind();
+    MemberAccess Access = L->Attrs.getAccess();
+    int32_t VFTableOffset = 0;
+    if (L->Attrs.isIntroducedVirtual()) {
+      const little32_t *L;
+      if (consumeObject(Data, L))
+        return std::make_error_code(std::errc::illegal_byte_sequence);
+      VFTableOffset = *L;
+    }
+
+    return MethodListRecord(L->Type, MethKind, Options, Access, VFTableOffset);
+  }
+
+  TypeIndex getType() const { return Type; }
+  MethodKind getMethodKind() const { return Kind; }
+  MethodOptions getOptions() const { return Options; }
+  MemberAccess getAccess() const { return Access; }
+  int32_t getVFTableOffset() const { return VFTableOffset; }
+
+private:
+  struct Layout {
     MemberAttributes Attrs;
     ulittle16_t Padding;
 
     TypeIndex Type;
     // If is introduced virtual method:
     //   VFTableOffset: int32_t offset in vftable
+  };
 
-  MethodKind getMethodKind() const {
-    return Attrs.getMethodKind();
-  }
-
-  bool isVirtual() const { return Attrs.isVirtual(); }
-  bool isIntroducedVirtual() const { return Attrs.isIntroducedVirtual(); }
+  TypeIndex Type;
+  MethodKind Kind;
+  MethodOptions Options;
+  MemberAccess Access;
+  int32_t VFTableOffset;
 };
 
 /// For method overload sets.  LF_METHOD
-struct OverloadedMethod {
+class OverloadedMethodRecord : public TypeRecord {
+public:
+  OverloadedMethodRecord(uint16_t NumOverloads, TypeIndex MethodList,
+                         StringRef Name)
+      : TypeRecord(TypeRecordKind::OverloadedMethod),
+        NumOverloads(NumOverloads), MethodList(MethodList), Name(Name) {}
+
+  static ErrorOr<OverloadedMethodRecord> deserialize(TypeRecordKind Kind,
+                                                     ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+    StringRef Name;
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
+
+    return OverloadedMethodRecord(L->MethodCount, L->MethList, Name);
+  }
+
+  uint16_t getNumOverloads() const { return NumOverloads; }
+  TypeIndex getMethodList() const { return MethodList; }
+  StringRef getName() const { return Name; }
+
+private:
+  struct Layout {
     ulittle16_t MethodCount; // Size of overload set
     TypeIndex MethList;      // Type index of methods in overload set
                              // Name: Null-terminated string
   };
 
-// LF_VFUNCTAB
-struct VirtualFunctionPointer {
-  ulittle16_t Pad0;
-  TypeIndex Type;   // Type of vfptr
+  uint16_t NumOverloads;
+  TypeIndex MethodList;
+  StringRef Name;
 };
 
 // LF_MEMBER
-struct DataMember {
+class DataMemberRecord : public TypeRecord {
+public:
+  DataMemberRecord(MemberAccess Access, TypeIndex Type, uint64_t Offset,
+                   StringRef Name)
+      : TypeRecord(TypeRecordKind::Member), Access(Access), Type(Type),
+        FieldOffset(Offset), Name(Name) {}
+
+  static ErrorOr<DataMemberRecord> deserialize(TypeRecordKind Kind,
+                                               ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    uint64_t Offset;
+    if (!decodeUIntLeaf(Data, Offset))
+      return std::make_error_code(std::errc::illegal_byte_sequence);
+    StringRef Name;
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
+
+    return DataMemberRecord(L->Attrs.getAccess(), L->Type, Offset, Name);
+  }
+
+  MemberAccess getAccess() const { return Access; }
+  TypeIndex getType() const { return Type; }
+  uint64_t getFieldOffset() const { return FieldOffset; }
+  StringRef getName() const { return Name; }
+
+private:
+  struct Layout {
     MemberAttributes Attrs; // Access control attributes, etc
     TypeIndex Type;
     // FieldOffset: LF_NUMERIC encoded byte offset
     // Name: Null-terminated string
   };
 
+  MemberAccess Access;
+  TypeIndex Type;
+  uint64_t FieldOffset;
+  StringRef Name;
+};
+
 // LF_STMEMBER
-struct StaticDataMember {
+class StaticDataMemberRecord : public TypeRecord {
+public:
+  StaticDataMemberRecord(MemberAccess Access, TypeIndex Type, StringRef Name)
+      : TypeRecord(TypeRecordKind::StaticMember), Access(Access), Type(Type),
+        Name(Name) {}
+
+  static ErrorOr<StaticDataMemberRecord> deserialize(TypeRecordKind Kind,
+                                                     ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    StringRef Name;
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
+
+    return StaticDataMemberRecord(L->Attrs.getAccess(), L->Type, Name);
+  }
+
+  MemberAccess getAccess() const { return Access; }
+  TypeIndex getType() const { return Type; }
+  StringRef getName() const { return Name; }
+
+private:
+  struct Layout {
     MemberAttributes Attrs; // Access control attributes, etc
     TypeIndex Type;
     // Name: Null-terminated string
   };
 
+  MemberAccess Access;
+  TypeIndex Type;
+  StringRef Name;
+};
+
 // LF_ENUMERATE
-struct Enumerator {
+class EnumeratorRecord : public TypeRecord {
+public:
+  EnumeratorRecord(MemberAccess Access, APSInt Value, StringRef Name)
+      : TypeRecord(TypeRecordKind::Enumerate), Access(Access), Value(Value),
+        Name(Name) {}
+
+  static ErrorOr<EnumeratorRecord> deserialize(TypeRecordKind Kind,
+                                               ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    if (Data.empty())
+      return std::make_error_code(std::errc::illegal_byte_sequence);
+    APSInt Value;
+    if (!decodeNumericLeaf(Data, Value))
+      return std::make_error_code(std::errc::illegal_byte_sequence);
+
+    StringRef Name;
+    if (auto EC = consumeCString(Data, Name))
+      return EC;
+
+    return EnumeratorRecord(L->Attrs.getAccess(), Value, Name);
+  }
+
+  MemberAccess getAccess() const { return Access; }
+  APSInt getValue() const { return Value; }
+  StringRef getName() const { return Name; }
+
+private:
+  struct Layout {
     MemberAttributes Attrs; // Access control attributes, etc
                             // EnumValue: LF_NUMERIC encoded enumerator value
                             // Name: Null-terminated string
   };
 
+  MemberAccess Access;
+  APSInt Value;
+  StringRef Name;
+};
+
+// LF_VFUNCTAB
+class VirtualFunctionPointerRecord : public TypeRecord {
+public:
+  VirtualFunctionPointerRecord(TypeIndex Type)
+      : TypeRecord(TypeRecordKind::VirtualFunctionTablePointer), Type(Type) {}
+  static ErrorOr<VirtualFunctionPointerRecord>
+  deserialize(TypeRecordKind Kind, ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    return VirtualFunctionPointerRecord(L->Type);
+  }
+
+  TypeIndex getType() const { return Type; }
+
+private:
+  struct Layout {
+    ulittle16_t Pad0;
+    TypeIndex Type; // Type of vfptr
+  };
+  TypeIndex Type;
+};
+
 // LF_BCLASS, LF_BINTERFACE
-struct BaseClass {
+class BaseClassRecord : public TypeRecord {
+public:
+  BaseClassRecord(MemberAccess Access, TypeIndex Type, uint64_t Offset)
+      : TypeRecord(TypeRecordKind::BaseClass), Access(Access), Type(Type),
+        Offset(Offset) {}
+
+  static ErrorOr<BaseClassRecord> deserialize(TypeRecordKind Kind,
+                                              ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    uint64_t Offset;
+    if (!decodeUIntLeaf(Data, Offset))
+      return std::make_error_code(std::errc::illegal_byte_sequence);
+
+    return BaseClassRecord(L->Attrs.getAccess(), L->BaseType, Offset);
+  }
+
+  MemberAccess getAccess() const { return Access; }
+  TypeIndex getBaseType() const { return Type; }
+  uint64_t getBaseOffset() const { return Offset; }
+
+private:
+  struct Layout {
     MemberAttributes Attrs; // Access control attributes, etc
     TypeIndex BaseType;     // Base class type
     // BaseOffset: LF_NUMERIC encoded byte offset of base from derived.
   };
+  MemberAccess Access;
+  TypeIndex Type;
+  uint64_t Offset;
+};
 
 // LF_VBCLASS, LF_IVBCLASS
-struct VirtualBaseClass {
+class VirtualBaseClassRecord : public TypeRecord {
+public:
+  VirtualBaseClassRecord(MemberAccess Access, TypeIndex BaseType,
+                         TypeIndex VBPtrType, uint64_t Offset, uint64_t Index)
+      : TypeRecord(TypeRecordKind::VirtualBaseClass), Access(Access),
+        BaseType(BaseType), VBPtrType(VBPtrType), VBPtrOffset(Offset),
+        VTableIndex(Index) {}
+
+  static ErrorOr<VirtualBaseClassRecord> deserialize(TypeRecordKind Kind,
+                                                     ArrayRef<uint8_t> &Data) {
+    const Layout *L = nullptr;
+    if (auto EC = consumeObject(Data, L))
+      return EC;
+
+    uint64_t Offset;
+    uint64_t Index;
+    if (!decodeUIntLeaf(Data, Offset))
+      return std::make_error_code(std::errc::illegal_byte_sequence);
+    if (!decodeUIntLeaf(Data, Index))
+      return std::make_error_code(std::errc::illegal_byte_sequence);
+
+    return VirtualBaseClassRecord(L->Attrs.getAccess(), L->BaseType,
+                                  L->VBPtrType, Offset, Index);
+  }
+
+  MemberAccess getAccess() const { return Access; }
+  TypeIndex getBaseType() const { return BaseType; }
+  TypeIndex getVBPtrType() const { return VBPtrType; }
+  uint64_t getVBPtrOffset() const { return VBPtrOffset; }
+  uint64_t getVTableIndex() const { return VTableIndex; }
+
+private:
+  struct Layout {
     MemberAttributes Attrs; // Access control attributes, etc.
     TypeIndex BaseType;     // Base class type
     TypeIndex VBPtrType;    // Virtual base pointer type
     // VBPtrOffset: Offset of vbptr from vfptr encoded as LF_NUMERIC.
     // VBTableIndex: Index of vbase within vbtable encoded as LF_NUMERIC.
   };
+  MemberAccess Access;
+  TypeIndex BaseType;
+  TypeIndex VBPtrType;
+  uint64_t VBPtrOffset;
+  uint64_t VTableIndex;
+};
 }
 }
 
 #endif

include/llvm/DebugInfo/CodeView/TypeRecords.def

 #define MEMBER_RECORD(ClassName, LeafEnum) TYPE_RECORD(ClassName, LeafEnum)
 #endif
 
 #ifndef MEMBER_RECORD_ALIAS
 #define MEMBER_RECORD_ALIAS(ClassName, LeafEnum) MEMBER_RECORD(ClassName, LeafEnum)
 #endif
 
 
-TYPE_RECORD(PointerType, LF_POINTER)
-TYPE_RECORD(TypeModifier, LF_MODIFIER)
-TYPE_RECORD(ProcedureType, LF_PROCEDURE)
-TYPE_RECORD(MemberFunctionType, LF_MFUNCTION)
-TYPE_RECORD(ArgList, LF_ARGLIST)
-
-TYPE_RECORD(ArrayType, LF_ARRAY)
-TYPE_RECORD(ClassType, LF_CLASS)
-TYPE_RECORD_ALIAS(ClassType, LF_STRUCTURE)
-TYPE_RECORD_ALIAS(ClassType, LF_INTERFACE)
-TYPE_RECORD(UnionType, LF_UNION)
-TYPE_RECORD(EnumType, LF_ENUM)
-TYPE_RECORD(TypeServer2, LF_TYPESERVER2)
-TYPE_RECORD(VFTableType, LF_VFTABLE)
-TYPE_RECORD(VTableShape, LF_VTSHAPE)
+TYPE_RECORD(PointerRecord, LF_POINTER)
+TYPE_RECORD(ModifierRecord, LF_MODIFIER)
+TYPE_RECORD(ProcedureRecord, LF_PROCEDURE)
+TYPE_RECORD(MemberFunctionRecord, LF_MFUNCTION)
+TYPE_RECORD(StringListRecord, LF_ARGLIST)
+
+TYPE_RECORD(ArrayRecord, LF_ARRAY)
+TYPE_RECORD(ClassRecord, LF_CLASS)
+TYPE_RECORD_ALIAS(ClassRecord, LF_STRUCTURE)
+TYPE_RECORD_ALIAS(ClassRecord, LF_INTERFACE)
+TYPE_RECORD(UnionRecord, LF_UNION)
+TYPE_RECORD(EnumRecord, LF_ENUM)
+TYPE_RECORD(TypeServer2Record, LF_TYPESERVER2)
+TYPE_RECORD(VirtualTableRecord, LF_VFTABLE)
+TYPE_RECORD(VirtualTableShapeRecord, LF_VTSHAPE)
 
 // Member type records. These are generally not length prefixed, and appear
 // inside of a field list record.
-MEMBER_RECORD(BaseClass, LF_BCLASS)
-MEMBER_RECORD_ALIAS(BaseClass, LF_BINTERFACE)
-MEMBER_RECORD(VirtualBaseClass, LF_VBCLASS)
-MEMBER_RECORD_ALIAS(VirtualBaseClass, LF_IVBCLASS)
-MEMBER_RECORD(VirtualFunctionPointer, LF_VFUNCTAB)
-MEMBER_RECORD(StaticDataMember, LF_STMEMBER)
-MEMBER_RECORD(OverloadedMethod, LF_METHOD)
-MEMBER_RECORD(DataMember, LF_MEMBER)
-MEMBER_RECORD(NestedType, LF_NESTTYPE)
-MEMBER_RECORD(OneMethod, LF_ONEMETHOD)
-MEMBER_RECORD(Enumerator, LF_ENUMERATE)
+MEMBER_RECORD(BaseClassRecord, LF_BCLASS)
+MEMBER_RECORD_ALIAS(BaseClassRecord, LF_BINTERFACE)
+MEMBER_RECORD(VirtualBaseClassRecord, LF_VBCLASS)
+MEMBER_RECORD_ALIAS(VirtualBaseClassRecord, LF_IVBCLASS)
+MEMBER_RECORD(VirtualFunctionPointerRecord, LF_VFUNCTAB)
+MEMBER_RECORD(StaticDataMemberRecord, LF_STMEMBER)
+MEMBER_RECORD(OverloadedMethodRecord, LF_METHOD)
+MEMBER_RECORD(DataMemberRecord, LF_MEMBER)
+MEMBER_RECORD(NestedTypeRecord, LF_NESTTYPE)
+MEMBER_RECORD(OneMethodRecord, LF_ONEMETHOD)
+MEMBER_RECORD(EnumeratorRecord, LF_ENUMERATE)
 
 // ID leaf records. Subsequent leaf types may be referenced from .debug$S.
 
-TYPE_RECORD(FuncId, LF_FUNC_ID)
-TYPE_RECORD(MemberFuncId, LF_MFUNC_ID)
-TYPE_RECORD(BuildInfo, LF_BUILDINFO)
-TYPE_RECORD_ALIAS(ArgList, LF_SUBSTR_LIST)
-TYPE_RECORD(StringId, LF_STRING_ID)
-TYPE_RECORD(UDTSrcLine, LF_UDT_SRC_LINE)
+TYPE_RECORD(FuncIdRecord, LF_FUNC_ID)
+TYPE_RECORD(MemberFunctionIdRecord, LF_MFUNC_ID)
+TYPE_RECORD(BuildInfoRecord, LF_BUILDINFO)
+TYPE_RECORD_ALIAS(StringListRecord, LF_SUBSTR_LIST)
+TYPE_RECORD(StringIdRecord, LF_STRING_ID)
+TYPE_RECORD(UdtSourceLineRecord, LF_UDT_SRC_LINE)
 
 #undef TYPE_RECORD
 #undef TYPE_RECORD_ALIAS
 #undef MEMBER_RECORD
 #undef MEMBER_RECORD_ALIAS

include/llvm/DebugInfo/CodeView/TypeStream.h

 //===- TypeStream.h ---------------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_DEBUGINFO_CODEVIEW_TYPESTREAM_H
 #define LLVM_DEBUGINFO_CODEVIEW_TYPESTREAM_H
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/DebugInfo/CodeView/CodeView.h"
 #include "llvm/DebugInfo/CodeView/RecordIterator.h"
-#include "llvm/Object/Error.h"
 #include "llvm/Support/Endian.h"
 
 #include <stdint.h>
 
 namespace llvm {
 class APSInt;
 
 namespace codeview {
 
-/// Consumes sizeof(T) bytes from the given byte sequence. Returns an error if
-/// there are not enough bytes remaining. Reinterprets the consumed bytes as a
-/// T object and points 'Res' at them.
-template <typename T>
-inline std::error_code consumeObject(StringRef &Data, const T *&Res) {
-  if (Data.size() < sizeof(*Res))
-    return object::object_error::parse_failed;
-  Res = reinterpret_cast<const T *>(Data.data());
-  Data = Data.drop_front(sizeof(*Res));
-  return std::error_code();
-}
-
-inline std::error_code consumeUInt32(StringRef &Data, uint32_t &Res) {
-  const support::ulittle32_t *IntPtr;
-  if (auto EC = consumeObject(Data, IntPtr))
-    return EC;
-  Res = *IntPtr;
-  return std::error_code();
-}
-
-/// Decodes a numeric "leaf" value. These are integer literals encountered in
-/// the type stream. If the value is positive and less than LF_NUMERIC (1 <<
-/// 15), it is emitted directly in Data. Otherwise, it has a tag like LF_CHAR
-/// that indicates the bitwidth and sign of the numeric data.
-bool decodeNumericLeaf(ArrayRef<uint8_t> &Data, APSInt &Num);
-
-inline bool decodeNumericLeaf(StringRef &Data, APSInt &Num) {
-  ArrayRef<uint8_t> Bytes(reinterpret_cast<const uint8_t *>(Data.data()),
-                          Data.size());
-  bool Success = decodeNumericLeaf(Bytes, Num);
-  Data = StringRef(reinterpret_cast<const char *>(Bytes.data()), Bytes.size());
-  return Success;
-}
-
-/// Decode a numeric leaf value that is known to be a uint32_t.
-bool decodeUIntLeaf(ArrayRef<uint8_t> &Data, uint64_t &Num);
-
 typedef RecordIterator<TypeLeafKind> TypeIterator;
 
 inline iterator_range<TypeIterator> makeTypeRange(ArrayRef<uint8_t> Data) {
   return make_range(TypeIterator(Data), TypeIterator());
 }
 
 } // end namespace codeview
 } // end namespace llvm
 
 #endif

include/llvm/DebugInfo/CodeView/TypeTableBuilder.h

 
 public:
   virtual ~TypeTableBuilder();
 
 public:
   TypeIndex writeModifier(const ModifierRecord &Record);
   TypeIndex writeProcedure(const ProcedureRecord &Record);
   TypeIndex writeMemberFunction(const MemberFunctionRecord &Record);
-  TypeIndex writeArgumentList(const ArgumentListRecord &Record);
+  TypeIndex writeArgumentList(const StringListRecord &Record);
   TypeIndex writeRecord(TypeRecordBuilder &builder);
   TypeIndex writePointer(const PointerRecord &Record);
-  TypeIndex writePointerToMember(const PointerToMemberRecord &Record);
   TypeIndex writeArray(const ArrayRecord &Record);
-  TypeIndex writeAggregate(const AggregateRecord &Record);
+  TypeIndex writeClass(const ClassRecord &Record);
   TypeIndex writeEnum(const EnumRecord &Record);
   TypeIndex writeBitField(const BitFieldRecord &Record);
   TypeIndex writeVirtualTableShape(const VirtualTableShapeRecord &Record);
 
   TypeIndex writeFieldList(FieldListRecordBuilder &FieldList);
   TypeIndex writeMethodList(MethodListRecordBuilder &MethodList);
 
 private:
   virtual TypeIndex writeRecord(llvm::StringRef record) = 0;
 };
 }
 }
 
 #endif

lib/CodeGen/AsmPrinter/CodeViewDebug.cpp

void CodeViewDebug::emitTypeInformation() {
   OS.AddComment("Debug section magic");
   OS.EmitIntValue(COFF::DEBUG_SECTION_MAGIC, 4);
 
   // This type info currently only holds function ids for use with inline call
   // frame info. All functions are assigned a simple 'void ()' type. Emit that
   // type here.
   unsigned ArgListIndex = getNextTypeIndex();
   OS.AddComment("Type record length");
-  OS.EmitIntValue(2 + sizeof(ArgList), 2);
+  OS.EmitIntValue(StringListRecord::getLayoutSize(), 2);
   OS.AddComment("Leaf type: LF_ARGLIST");
   OS.EmitIntValue(LF_ARGLIST, 2);
   OS.AddComment("Number of arguments");
   OS.EmitIntValue(0, 4);
 
   unsigned VoidFnTyIdx = getNextTypeIndex();
   OS.AddComment("Type record length");
-  OS.EmitIntValue(2 + sizeof(ProcedureType), 2);
+  OS.EmitIntValue(ProcedureRecord::getLayoutSize(), 2);
   OS.AddComment("Leaf type: LF_PROCEDURE");
   OS.EmitIntValue(LF_PROCEDURE, 2);
   OS.AddComment("Return type index");
   OS.EmitIntValue(TypeIndex::Void().getIndex(), 4);
   OS.AddComment("Calling convention");
   OS.EmitIntValue(char(CallingConvention::NearC), 1);
   OS.AddComment("Function options");
   OS.EmitIntValue(char(FunctionOptions::None), 1);

lib/DebugInfo/CodeView/FieldListRecordBuilder.cpp

void FieldListRecordBuilder::writeMember(MemberAccess Access, TypeIndex Type,
 
   finishSubRecord();
 }
 
 void FieldListRecordBuilder::writeMethod(uint16_t OverloadCount,
                                          TypeIndex MethodList, StringRef Name) {
   TypeRecordBuilder &Builder = getBuilder();
 
-  Builder.writeTypeRecordKind(TypeRecordKind::Method);
+  Builder.writeTypeRecordKind(TypeRecordKind::OverloadedMethod);
   Builder.writeUInt16(OverloadCount);
   Builder.writeTypeIndex(MethodList);
   Builder.writeNullTerminatedString(Name);
 
   finishSubRecord();
 }
 
 void FieldListRecordBuilder::writeOneMethod(
void FieldListRecordBuilder::writeVirtualFunctionTablePointer(TypeIndex Type) {
   TypeRecordBuilder &Builder = getBuilder();
 
   Builder.writeTypeRecordKind(TypeRecordKind::VirtualFunctionTablePointer);
   Builder.writeUInt16(0);
   Builder.writeTypeIndex(Type);
 
   finishSubRecord();
 }
 No newline at end of file

lib/DebugInfo/CodeView/TypeDumper.cpp

 /// the visitor out of TypeDumper.h.
 class CVTypeDumperImpl : public CVTypeVisitor<CVTypeDumperImpl> {
 public:
   CVTypeDumperImpl(CVTypeDumper &CVTD, ScopedPrinter &W, bool PrintRecordBytes)
       : CVTD(CVTD), W(W), PrintRecordBytes(PrintRecordBytes) {}
 
   /// CVTypeVisitor overrides.
 #define TYPE_RECORD(ClassName, LeafEnum)                                       \
-  void visit##ClassName(TypeLeafKind LeafType, const ClassName *Record,        \
-                        ArrayRef<uint8_t> LeafData);
+  void visit##ClassName(TypeLeafKind LeafType, ClassName &Record);
 #define TYPE_RECORD_ALIAS(ClassName, LeafEnum)
 #define MEMBER_RECORD(ClassName, LeafEnum)                                     \
-  void visit##ClassName(TypeLeafKind LeafType, const ClassName *Record,        \
-                        ArrayRef<uint8_t> &FieldData);
+  void visit##ClassName(TypeLeafKind LeafType, ClassName &Record);
 #define MEMBER_RECORD_ALIAS(ClassName, LeafEnum)
 #include "llvm/DebugInfo/CodeView/TypeRecords.def"
 
   /// Method overload lists are a special case.
   void visitMethodList(TypeLeafKind Leaf, ArrayRef<uint8_t> LeafData);
 
   void visitUnknownMember(TypeLeafKind Leaf);
 
   void visitTypeBegin(TypeLeafKind Leaf, ArrayRef<uint8_t> LeafData);
   void visitTypeEnd(TypeLeafKind Leaf, ArrayRef<uint8_t> LeafData);
 
   void printMemberAttributes(MemberAttributes Attrs);
+  void printMemberAttributes(MemberAccess Access, MethodKind Kind,
+                             MethodOptions Options);
 
 private:
   /// Forwards to the dumper, which holds the persistent state from visitation.
   StringRef getTypeName(TypeIndex TI) {
     return CVTD.getTypeName(TI);
   }
 
   void printTypeIndex(StringRef FieldName, TypeIndex TI) {
     CVTD.printTypeIndex(FieldName, TI);
   }
 
   CVTypeDumper &CVTD;
   ScopedPrinter &W;
   bool PrintRecordBytes = false;
 
   /// Name of the current type. Only valid before visitTypeEnd.
   StringRef Name;
 };
 
 } // end anonymous namespace
 
-/// Reinterpret a byte array as an array of characters. Does not interpret as
-/// a C string, as StringRef has several helpers (split) that make that easy.
-static StringRef getBytesAsCharacters(ArrayRef<uint8_t> LeafData) {
-  return StringRef(reinterpret_cast<const char *>(LeafData.data()),
-                   LeafData.size());
-}
-
-static StringRef getBytesAsCString(ArrayRef<uint8_t> LeafData) {
-  return getBytesAsCharacters(LeafData).split('\0').first;
-}
-
 static StringRef getLeafTypeName(TypeLeafKind LT) {
   switch (LT) {
 #define KNOWN_TYPE(LeafName, Value, ClassName) \
   case LeafName: return #ClassName;
 #include "llvm/DebugInfo/CodeView/CVLeafTypes.def"
   default:
     break;
   }
void CVTypeDumperImpl::visitTypeEnd(TypeLeafKind Leaf,
 
   if (PrintRecordBytes)
     W.printBinaryBlock("LeafData", getBytesAsCharacters(LeafData));
 
   W.unindent();
   W.startLine() << "}\n";
 }
 
-void CVTypeDumperImpl::visitStringId(TypeLeafKind Leaf, const StringId *String,
-                                     ArrayRef<uint8_t> LeafData) {
-  W.printHex("Id", String->id.getIndex());
-  StringRef StringData = getBytesAsCString(LeafData);
-  W.printString("StringData", StringData);
+void CVTypeDumperImpl::visitStringIdRecord(TypeLeafKind Leaf,
+                                           StringIdRecord &String) {
+  printTypeIndex("Id", String.getId());
+  W.printString("StringData", String.getString());
   // Put this in CVUDTNames so it gets printed with LF_UDT_SRC_LINE.
-  Name = StringData;
+  Name = String.getString();
 }
-
-void CVTypeDumperImpl::visitArgList(TypeLeafKind Leaf, const ArgList *Args,
-                                    ArrayRef<uint8_t> LeafData) {
-  W.printNumber("NumArgs", Args->NumArgs);
+void CVTypeDumperImpl::visitStringListRecord(TypeLeafKind Leaf,
+                                             StringListRecord &Args) {
+  auto Indices = Args.getIndices();
+  uint32_t Size = Indices.size();
+  W.printNumber("NumArgs", Size);
   ListScope Arguments(W, "Arguments");
   SmallString<256> TypeName("(");
-  for (uint32_t ArgI = 0; ArgI != Args->NumArgs; ++ArgI) {
-    const TypeIndex *Type;
-    if (!consumeObject(LeafData, Type))
-      return;
-    printTypeIndex("ArgType", *Type);
-    StringRef ArgTypeName = getTypeName(*Type);
+  for (uint32_t I = 0; I < Size; ++I) {
+    printTypeIndex("ArgType", Indices[I]);
+    StringRef ArgTypeName = getTypeName(Indices[I]);
     TypeName.append(ArgTypeName);
-    if (ArgI + 1 != Args->NumArgs)
+    if (I + 1 != Size)
       TypeName.append(", ");
   }
   TypeName.push_back(')');
   Name = CVTD.saveName(TypeName);
 }
 
-void CVTypeDumperImpl::visitClassType(TypeLeafKind Leaf, const ClassType *Class,
-                                      ArrayRef<uint8_t> LeafData) {
-  W.printNumber("MemberCount", Class->MemberCount);
-  uint16_t Props = Class->Properties;
+void CVTypeDumperImpl::visitClassRecord(TypeLeafKind Leaf, ClassRecord &Class) {
+  uint16_t Props = static_cast<uint16_t>(Class.getOptions());
+  W.printNumber("MemberCount", Class.getMemberCount());
   W.printFlags("Properties", Props, makeArrayRef(ClassOptionNames));
-  printTypeIndex("FieldList", Class->FieldList);
-  printTypeIndex("DerivedFrom", Class->DerivedFrom);
-  printTypeIndex("VShape", Class->VShape);
-  uint64_t SizeOf;
-  if (!decodeUIntLeaf(LeafData, SizeOf))
-    return parseError();
-  W.printNumber("SizeOf", SizeOf);
-  StringRef LeafChars = getBytesAsCharacters(LeafData);
-  StringRef LinkageName;
-  std::tie(Name, LinkageName) = LeafChars.split('\0');
-  W.printString("Name", Name);
-  if (Props & uint16_t(ClassOptions::HasUniqueName)) {
-    LinkageName = LinkageName.split('\0').first;
-    if (LinkageName.empty())
-      return parseError();
-    W.printString("LinkageName", LinkageName);
-  }
+  printTypeIndex("FieldList", Class.getFieldList());
+  printTypeIndex("DerivedFrom", Class.getDerivationList());
+  printTypeIndex("VShape", Class.getVTableShape());
+  W.printNumber("SizeOf", Class.getSize());
+  W.printString("Name", Class.getName());
+  if (Props & uint16_t(ClassOptions::HasUniqueName))
+    W.printString("LinkageName", Class.getUniqueName());
+  Name = Class.getName();
 }
 
-void CVTypeDumperImpl::visitUnionType(TypeLeafKind Leaf, const UnionType *Union,
-                                      ArrayRef<uint8_t> LeafData) {
-  W.printNumber("MemberCount", Union->MemberCount);
-  uint16_t Props = Union->Properties;
+void CVTypeDumperImpl::visitUnionRecord(TypeLeafKind Leaf, UnionRecord &Union) {
+  uint16_t Props = static_cast<uint16_t>(Union.getOptions());
+  W.printNumber("MemberCount", Union.getMemberCount());
   W.printFlags("Properties", Props, makeArrayRef(ClassOptionNames));
-  printTypeIndex("FieldList", Union->FieldList);
-  uint64_t SizeOf;
-  if (!decodeUIntLeaf(LeafData, SizeOf))
-    return parseError();
-  W.printNumber("SizeOf", SizeOf);
-  StringRef LeafChars = getBytesAsCharacters(LeafData);
-  StringRef LinkageName;
-  std::tie(Name, LinkageName) = LeafChars.split('\0');
-  W.printString("Name", Name);
-  if (Props & uint16_t(ClassOptions::HasUniqueName)) {
-    LinkageName = LinkageName.split('\0').first;
-    if (LinkageName.empty())
-      return parseError();
-    W.printString("LinkageName", LinkageName);
-  }
+  printTypeIndex("FieldList", Union.getFieldList());
+  W.printNumber("SizeOf", Union.getSize());
+  W.printString("Name", Union.getName());
+  if (Props & uint16_t(ClassOptions::HasUniqueName))
+    W.printString("LinkageName", Union.getUniqueName());
+  Name = Union.getName();
 }
 
-void CVTypeDumperImpl::visitEnumType(TypeLeafKind Leaf, const EnumType *Enum,
-                                     ArrayRef<uint8_t> LeafData) {
-  W.printNumber("NumEnumerators", Enum->NumEnumerators);
-  W.printFlags("Properties", uint16_t(Enum->Properties),
+void CVTypeDumperImpl::visitEnumRecord(TypeLeafKind Leaf, EnumRecord &Enum) {
+  W.printNumber("NumEnumerators", Enum.getMemberCount());
+  W.printFlags("Properties", uint16_t(Enum.getOptions()),
                makeArrayRef(ClassOptionNames));
-  printTypeIndex("UnderlyingType", Enum->UnderlyingType);
-  printTypeIndex("FieldListType", Enum->FieldListType);
-  Name = getBytesAsCString(LeafData);
-  W.printString("Name", Name);
-}
-
-void CVTypeDumperImpl::visitArrayType(TypeLeafKind Leaf, const ArrayType *AT,
-                                      ArrayRef<uint8_t> LeafData) {
-  printTypeIndex("ElementType", AT->ElementType);
-  printTypeIndex("IndexType", AT->IndexType);
-  uint64_t SizeOf;
-  if (!decodeUIntLeaf(LeafData, SizeOf))
-    return parseError();
-  W.printNumber("SizeOf", SizeOf);
-  Name = getBytesAsCString(LeafData);
-  W.printString("Name", Name);
-}
-
-void CVTypeDumperImpl::visitVFTableType(TypeLeafKind Leaf,
-                                        const VFTableType *VFT,
-                                        ArrayRef<uint8_t> LeafData) {
-  printTypeIndex("CompleteClass", VFT->CompleteClass);
-  printTypeIndex("OverriddenVFTable", VFT->OverriddenVFTable);
-  W.printHex("VFPtrOffset", VFT->VFPtrOffset);
-  StringRef NamesData = getBytesAsCharacters(LeafData.slice(0, VFT->NamesLen));
-  std::tie(Name, NamesData) = NamesData.split('\0');
-  W.printString("VFTableName", Name);
-  while (!NamesData.empty()) {
-    StringRef MethodName;
-    std::tie(MethodName, NamesData) = NamesData.split('\0');
-    W.printString("MethodName", MethodName);
-  }
-}
-
-void CVTypeDumperImpl::visitMemberFuncId(TypeLeafKind Leaf,
-                                         const MemberFuncId *Id,
-                                         ArrayRef<uint8_t> LeafData) {
-  printTypeIndex("ClassType", Id->ClassType);
-  printTypeIndex("FunctionType", Id->FunctionType);
-  Name = getBytesAsCString(LeafData);
-  W.printString("Name", Name);
-}
-
-void CVTypeDumperImpl::visitProcedureType(TypeLeafKind Leaf,
-                                          const ProcedureType *Proc,
-                                          ArrayRef<uint8_t> LeafData) {
-  printTypeIndex("ReturnType", Proc->ReturnType);
-  W.printEnum("CallingConvention", uint8_t(Proc->CallConv),
+  printTypeIndex("UnderlyingType", Enum.getUnderlyingType());
+  printTypeIndex("FieldListType", Enum.getFieldList());
+  W.printString("Name", Enum.getName());
+  Name = Enum.getName();
+}
+
+void CVTypeDumperImpl::visitArrayRecord(TypeLeafKind Leaf, ArrayRecord &AT) {
+  printTypeIndex("ElementType", AT.getElementType());
+  printTypeIndex("IndexType", AT.getIndexType());
+  W.printNumber("SizeOf", AT.getSize());
+  W.printString("Name", AT.getName());
+  Name = AT.getName();
+}
+
+void CVTypeDumperImpl::visitVirtualTableRecord(TypeLeafKind Leaf,
+                                               VirtualTableRecord &VFT) {
+  printTypeIndex("CompleteClass", VFT.getCompleteClass());
+  printTypeIndex("OverriddenVFTable", VFT.getOverriddenVTable());
+  W.printHex("VFPtrOffset", VFT.getVFPtrOffset());
+  W.printString("VFTableName", VFT.getName());
+  for (auto N : VFT.getMethodNames())
+    W.printString("MethodName", N);
+  Name = VFT.getName();
+}
+
+void CVTypeDumperImpl::visitMemberFunctionIdRecord(TypeLeafKind Leaf,
+                                                   MemberFunctionIdRecord &Id) {
+  printTypeIndex("ClassType", Id.getClassType());
+  printTypeIndex("FunctionType", Id.getFunctionType());
+  W.printString("Name", Id.getName());
+  Name = Id.getName();
+
+void CVTypeDumperImpl::visitProcedureRecord(TypeLeafKind Leaf,
+                                            ProcedureRecord &Proc) {
+  printTypeIndex("ReturnType", Proc.getReturnType());
+  W.printEnum("CallingConvention", uint8_t(Proc.getCallConv()),
               makeArrayRef(CallingConventions));
-  W.printFlags("FunctionOptions", uint8_t(Proc->Options),
+  W.printFlags("FunctionOptions", uint8_t(Proc.getOptions()),
                makeArrayRef(FunctionOptionEnum));
-  W.printNumber("NumParameters", Proc->NumParameters);
-  printTypeIndex("ArgListType", Proc->ArgListType);
+  W.printNumber("NumParameters", Proc.getParameterCount());
+  printTypeIndex("ArgListType", Proc.getArgumentList());
 
-  StringRef ReturnTypeName = getTypeName(Proc->ReturnType);
-  StringRef ArgListTypeName = getTypeName(Proc->ArgListType);
+  StringRef ReturnTypeName = getTypeName(Proc.getReturnType());
+  StringRef ArgListTypeName = getTypeName(Proc.getArgumentList());
   SmallString<256> TypeName(ReturnTypeName);
   TypeName.push_back(' ');
   TypeName.append(ArgListTypeName);
   Name = CVTD.saveName(TypeName);
 }
 
-void CVTypeDumperImpl::visitMemberFunctionType(
-    TypeLeafKind Leaf, const MemberFunctionType *MemberFunc,
-    ArrayRef<uint8_t> LeafData) {
-  printTypeIndex("ReturnType", MemberFunc->ReturnType);
-  printTypeIndex("ClassType", MemberFunc->ClassType);
-  printTypeIndex("ThisType", MemberFunc->ThisType);
-  W.printEnum("CallingConvention", uint8_t(MemberFunc->CallConv),
+void CVTypeDumperImpl::visitMemberFunctionRecord(TypeLeafKind Leaf,
+                                                 MemberFunctionRecord &MF) {
+  printTypeIndex("ReturnType", MF.getReturnType());
+  printTypeIndex("ClassType", MF.getClassType());
+  printTypeIndex("ThisType", MF.getThisType());
+  W.printEnum("CallingConvention", uint8_t(MF.getCallConv()),
               makeArrayRef(CallingConventions));
-  W.printFlags("FunctionOptions", uint8_t(MemberFunc->Options),
+  W.printFlags("FunctionOptions", uint8_t(MF.getOptions()),
                makeArrayRef(FunctionOptionEnum));
-  W.printNumber("NumParameters", MemberFunc->NumParameters);
-  printTypeIndex("ArgListType", MemberFunc->ArgListType);
-  W.printNumber("ThisAdjustment", MemberFunc->ThisAdjustment);
-
-  StringRef ReturnTypeName = getTypeName(MemberFunc->ReturnType);
-  StringRef ClassTypeName = getTypeName(MemberFunc->ClassType);
-  StringRef ArgListTypeName = getTypeName(MemberFunc->ArgListType);
+  W.printNumber("NumParameters", MF.getParameterCount());
+  printTypeIndex("ArgListType", MF.getArgumentList());
+  W.printNumber("ThisAdjustment", MF.getThisPointerAdjustment());
+
+  StringRef ReturnTypeName = getTypeName(MF.getReturnType());
+  StringRef ClassTypeName = getTypeName(MF.getClassType());
+  StringRef ArgListTypeName = getTypeName(MF.getArgumentList());
   SmallString<256> TypeName(ReturnTypeName);
   TypeName.push_back(' ');
   TypeName.append(ClassTypeName);
   TypeName.append("::");
   TypeName.append(ArgListTypeName);
   Name = CVTD.saveName(TypeName);
 }
 
 void CVTypeDumperImpl::visitMethodList(TypeLeafKind Leaf,
                                        ArrayRef<uint8_t> LeafData) {
   while (!LeafData.empty()) {
-    const MethodListEntry *Method;
-    if (!consumeObject(LeafData, Method))
+    auto Method =
+        MethodListRecord::deserialize(TypeRecordKind::MethodList, LeafData);
+    if (Method)
       return;
+    const MethodListRecord &M = *Method;
+
     ListScope S(W, "Method");
-    printMemberAttributes(Method->Attrs);
-    printTypeIndex("Type", Method->Type);
-    if (Method->isIntroducedVirtual()) {
-      const little32_t *VFTOffsetPtr;
-      if (!consumeObject(LeafData, VFTOffsetPtr))
-        return;
-      W.printHex("VFTableOffset", *VFTOffsetPtr);
-    }
+    printMemberAttributes(M.getAccess(), M.getMethodKind(), M.getOptions());
+    printTypeIndex("Type", Method->getType());
+    if (Method->getMethodKind() == MethodKind::IntroducingVirtual ||
+        Method->getMethodKind() == MethodKind::PureIntroducingVirtual)
+      W.printHex("VFTableOffset", Method->getVFTableOffset());
   }
 }
 
-void CVTypeDumperImpl::visitFuncId(TypeLeafKind Leaf, const FuncId *Func,
-                                   ArrayRef<uint8_t> LeafData) {
-  printTypeIndex("ParentScope", Func->ParentScope);
-  printTypeIndex("FunctionType", Func->FunctionType);
-  Name = getBytesAsCString(LeafData);
-  W.printString("Name", Name);
-}
+void CVTypeDumperImpl::visitFuncIdRecord(TypeLeafKind Leaf,
+                                         FuncIdRecord &Func) {
+  printTypeIndex("ParentScope", Func.getParentScope());
+  printTypeIndex("FunctionType", Func.getFunctionType());
+  W.printString("Name", Func.getName());
+  Name = Func.getName();
+}
+
+void CVTypeDumperImpl::visitTypeServer2Record(TypeLeafKind Leaf,
+                                              TypeServer2Record &TS) {
+  W.printBinary("Signature", TS.getGuid());
+  W.printNumber("Age", TS.getAge());
+  W.printString("Name", TS.getName());
+  Name = TS.getName();
+}
+
+void CVTypeDumperImpl::visitPointerRecord(TypeLeafKind Leaf,
+                                          PointerRecord &Ptr) {
+  printTypeIndex("PointeeType", Ptr.getReferentType());
+  W.printHex("PointerAttributes", uint32_t(Ptr.getOptions()));
+  W.printEnum("PtrType", unsigned(Ptr.getPointerKind()),
+              makeArrayRef(PtrKindNames));
+  W.printEnum("PtrMode", unsigned(Ptr.getMode()), makeArrayRef(PtrModeNames));
 
-void CVTypeDumperImpl::visitTypeServer2(TypeLeafKind Leaf,
-                                        const TypeServer2 *TypeServer,
-                                        ArrayRef<uint8_t> LeafData) {
-  W.printBinary("Signature", StringRef(TypeServer->Signature, 16));
-  W.printNumber("Age", TypeServer->Age);
-  Name = getBytesAsCString(LeafData);
-  W.printString("Name", Name);
-}
+  W.printNumber("IsFlat", Ptr.isFlat());
+  W.printNumber("IsConst", Ptr.isConst());
+  W.printNumber("IsVolatile", Ptr.isVolatile());
+  W.printNumber("IsUnaligned", Ptr.isUnaligned());
 
-void CVTypeDumperImpl::visitPointerType(TypeLeafKind Leaf,
-                                        const PointerType *Ptr,
-                                        ArrayRef<uint8_t> LeafData) {
-  printTypeIndex("PointeeType", Ptr->PointeeType);
-  W.printHex("PointerAttributes", Ptr->Attrs);
-  W.printEnum("PtrType", unsigned(Ptr->getPtrKind()),
-              makeArrayRef(PtrKindNames));
-  W.printEnum("PtrMode", unsigned(Ptr->getPtrMode()),
-              makeArrayRef(PtrModeNames));
-  W.printNumber("IsFlat", Ptr->isFlat());
-  W.printNumber("IsConst", Ptr->isConst());
-  W.printNumber("IsVolatile", Ptr->isVolatile());
-  W.printNumber("IsUnaligned", Ptr->isUnaligned());
-
-  if (Ptr->isPointerToMember()) {
-    const PointerToMemberTail *PMT;
-    if (!consumeObject(LeafData, PMT))
-      return;
-    printTypeIndex("ClassType", PMT->ClassType);
-    W.printEnum("Representation", PMT->Representation,
+  if (Ptr.isPointerToMember()) {
+    const MemberPointerInfo &MI = Ptr.getMemberInfo();
+
+    printTypeIndex("ClassType", MI.getContainingType());
+    W.printEnum("Representation", uint16_t(MI.getRepresentation()),
                 makeArrayRef(PtrMemberRepNames));
 
-    StringRef PointeeName = getTypeName(Ptr->PointeeType);
-    StringRef ClassName = getTypeName(PMT->ClassType);
+    StringRef PointeeName = getTypeName(Ptr.getReferentType());
+    StringRef ClassName = getTypeName(MI.getContainingType());
     SmallString<256> TypeName(PointeeName);
     TypeName.push_back(' ');
     TypeName.append(ClassName);
     TypeName.append("::*");
     Name = CVTD.saveName(TypeName);
   } else {
-    W.printBinaryBlock("TailData", getBytesAsCharacters(LeafData));
-
     SmallString<256> TypeName;
-    if (Ptr->isConst())
+    if (Ptr.isConst())
       TypeName.append("const ");
-    if (Ptr->isVolatile())
+    if (Ptr.isVolatile())
       TypeName.append("volatile ");
-    if (Ptr->isUnaligned())
+    if (Ptr.isUnaligned())
       TypeName.append("__unaligned ");
 
-    TypeName.append(getTypeName(Ptr->PointeeType));
+    TypeName.append(getTypeName(Ptr.getReferentType()));
 
-    if (Ptr->getPtrMode() == PointerMode::LValueReference)
+    if (Ptr.getMode() == PointerMode::LValueReference)
       TypeName.append("&");
-    else if (Ptr->getPtrMode() == PointerMode::RValueReference)
+    else if (Ptr.getMode() == PointerMode::RValueReference)
       TypeName.append("&&");
-    else if (Ptr->getPtrMode() == PointerMode::Pointer)
+    else if (Ptr.getMode() == PointerMode::Pointer)
       TypeName.append("*");
 
     Name = CVTD.saveName(TypeName);
   }
 }
 
-void CVTypeDumperImpl::visitTypeModifier(TypeLeafKind Leaf,
-                                         const TypeModifier *Mod,
-                                         ArrayRef<uint8_t> LeafData) {
-  printTypeIndex("ModifiedType", Mod->ModifiedType);
-  W.printFlags("Modifiers", Mod->Modifiers, makeArrayRef(TypeModifierNames));
+void CVTypeDumperImpl::visitModifierRecord(TypeLeafKind Leaf,
+                                           ModifierRecord &Mod) {
+  uint16_t Mods = static_cast<uint16_t>(Mod.getModifiers());
+  printTypeIndex("ModifiedType", Mod.getModifiedType());
+  W.printFlags("Modifiers", Mods, makeArrayRef(TypeModifierNames));
 
-  StringRef ModifiedName = getTypeName(Mod->ModifiedType);
+  StringRef ModifiedName = getTypeName(Mod.getModifiedType());
   SmallString<256> TypeName;
-  if (Mod->Modifiers & uint16_t(ModifierOptions::Const))
+  if (Mods & uint16_t(ModifierOptions::Const))
     TypeName.append("const ");
-  if (Mod->Modifiers & uint16_t(ModifierOptions::Volatile))
+  if (Mods & uint16_t(ModifierOptions::Volatile))
     TypeName.append("volatile ");
-  if (Mod->Modifiers & uint16_t(ModifierOptions::Unaligned))
+  if (Mods & uint16_t(ModifierOptions::Unaligned))
     TypeName.append("__unaligned ");
   TypeName.append(ModifiedName);
   Name = CVTD.saveName(TypeName);
 }
 
-void CVTypeDumperImpl::visitVTableShape(TypeLeafKind Leaf,
-                                        const VTableShape *Shape,
-                                        ArrayRef<uint8_t> LeafData) {
-  unsigned VFEntryCount = Shape->VFEntryCount;
-  W.printNumber("VFEntryCount", VFEntryCount);
-  // We could print out whether the methods are near or far, but in practice
-  // today everything is CV_VTS_near32, so it's just noise.
+void CVTypeDumperImpl::visitVirtualTableShapeRecord(
+    TypeLeafKind Leaf, VirtualTableShapeRecord &Shape) {
+  W.printNumber("VFEntryCount", Shape.getEntryCount());
 }
 
-void CVTypeDumperImpl::visitUDTSrcLine(TypeLeafKind Leaf,
-                                       const UDTSrcLine *Line,
-                                       ArrayRef<uint8_t> LeafData) {
-  printTypeIndex("UDT", Line->UDT);
-  printTypeIndex("SourceFile", Line->SourceFile);
-  W.printNumber("LineNumber", Line->LineNumber);
+void CVTypeDumperImpl::visitUdtSourceLineRecord(TypeLeafKind Leaf,
+                                                UdtSourceLineRecord &Line) {
+  printTypeIndex("UDT", Line.getUDT());
+  printTypeIndex("SourceFile", Line.getSourceFile());
+  W.printNumber("LineNumber", Line.getLineNumber());
 }
 
-void CVTypeDumperImpl::visitBuildInfo(TypeLeafKind Leaf, const BuildInfo *Args,
-                                      ArrayRef<uint8_t> LeafData) {
-  W.printNumber("NumArgs", Args->NumArgs);
+void CVTypeDumperImpl::visitBuildInfoRecord(TypeLeafKind Leaf,
+                                            BuildInfoRecord &Args) {
+  W.printNumber("NumArgs", Args.getArgs().size());
 
   ListScope Arguments(W, "Arguments");
-  for (uint32_t ArgI = 0; ArgI != Args->NumArgs; ++ArgI) {
-    const TypeIndex *Type;
-    if (!consumeObject(LeafData, Type))
-      return;
-    printTypeIndex("ArgType", *Type);
+  for (auto Arg : Args.getArgs()) {
+    printTypeIndex("ArgType", Arg);
   }
 }
 
 void CVTypeDumperImpl::printMemberAttributes(MemberAttributes Attrs) {
-  W.printEnum("AccessSpecifier", uint8_t(Attrs.getAccess()),
+  return printMemberAttributes(Attrs.getAccess(), Attrs.getMethodKind(),
+                               Attrs.getFlags());
+}
+
+void CVTypeDumperImpl::printMemberAttributes(MemberAccess Access,
+                                             MethodKind Kind,
+                                             MethodOptions Options) {
+  W.printEnum("AccessSpecifier", uint8_t(Access),
               makeArrayRef(MemberAccessNames));
-  auto MK = Attrs.getMethodKind();
   // Data members will be vanilla. Don't try to print a method kind for them.
-  if (MK != MethodKind::Vanilla)
-    W.printEnum("MethodKind", unsigned(MK), makeArrayRef(MemberKindNames));
-  if (Attrs.getFlags() != MethodOptions::None) {
-    W.printFlags("MethodOptions", unsigned(Attrs.getFlags()),
+  if (Kind != MethodKind::Vanilla)
+    W.printEnum("MethodKind", unsigned(Kind), makeArrayRef(MemberKindNames));
+  if (Options != MethodOptions::None) {
+    W.printFlags("MethodOptions", unsigned(Options),
                  makeArrayRef(MethodOptionNames));
   }
 }
 
 void CVTypeDumperImpl::visitUnknownMember(TypeLeafKind Leaf) {
   W.printHex("UnknownMember", unsigned(Leaf));
 }
 
-void CVTypeDumperImpl::visitNestedType(TypeLeafKind Leaf,
-                                       const NestedType *Nested,
-                                       ArrayRef<uint8_t> &FieldData) {
+void CVTypeDumperImpl::visitNestedTypeRecord(TypeLeafKind Leaf,
+                                             NestedTypeRecord &Nested) {
   DictScope S(W, "NestedType");
-  printTypeIndex("Type", Nested->Type);
-  StringRef Name = getBytesAsCString(FieldData);
-  FieldData = FieldData.drop_front(Name.size() + 1);
-  W.printString("Name", Name);
+  printTypeIndex("Type", Nested.getNestedType());
+  W.printString("Name", Nested.getName());
+  Name = Nested.getName();
 }
 
-void CVTypeDumperImpl::visitOneMethod(TypeLeafKind Leaf,
-                                      const OneMethod *Method,
-                                      ArrayRef<uint8_t> &FieldData) {
+void CVTypeDumperImpl::visitOneMethodRecord(TypeLeafKind Leaf,
+                                            OneMethodRecord &Method) {
   DictScope S(W, "OneMethod");
-  printMemberAttributes(Method->Attrs);
-  printTypeIndex("Type", Method->Type);
+  MethodKind K = Method.getKind();
+  printMemberAttributes(Method.getAccess(), K, Method.getOptions());
+  printTypeIndex("Type", Method.getType());
   // If virtual, then read the vftable offset.
-  if (Method->isIntroducedVirtual()) {
-    const little32_t *VFTOffsetPtr;
-    if (!consumeObject(FieldData, VFTOffsetPtr))
-      return;
-    W.printHex("VFTableOffset", *VFTOffsetPtr);
-  }
-  StringRef Name = getBytesAsCString(FieldData);
-  FieldData = FieldData.drop_front(Name.size() + 1);
-  W.printString("Name", Name);
+  if (Method.isIntroducingVirtual())
+    W.printHex("VFTableOffset", Method.getVFTableOffset());
+  W.printString("Name", Method.getName());
+  Name = Method.getName();
 }
 
-void CVTypeDumperImpl::visitOverloadedMethod(TypeLeafKind Leaf,
-                                             const OverloadedMethod *Method,
-                                             ArrayRef<uint8_t> &FieldData) {
+void CVTypeDumperImpl::visitOverloadedMethodRecord(
+    TypeLeafKind Leaf, OverloadedMethodRecord &Method) {
   DictScope S(W, "OverloadedMethod");
-  W.printHex("MethodCount", Method->MethodCount);
-  W.printHex("MethodListIndex", Method->MethList.getIndex());
-  StringRef Name = getBytesAsCString(FieldData);
-  FieldData = FieldData.drop_front(Name.size() + 1);
-  W.printString("Name", Name);
+  W.printHex("MethodCount", Method.getNumOverloads());
+  printTypeIndex("MethodListIndex", Method.getMethodList());
+  W.printString("Name", Method.getName());
+  Name = Method.getName();
 }
 
-void CVTypeDumperImpl::visitDataMember(TypeLeafKind Leaf,
-                                       const DataMember *Field,
-                                       ArrayRef<uint8_t> &FieldData) {
+void CVTypeDumperImpl::visitDataMemberRecord(TypeLeafKind Leaf,
+                                             DataMemberRecord &Field) {
   DictScope S(W, "DataMember");
-  printMemberAttributes(Field->Attrs);
-  printTypeIndex("Type", Field->Type);
-  uint64_t FieldOffset;
-  if (!decodeUIntLeaf(FieldData, FieldOffset))
-    return parseError();
-  W.printHex("FieldOffset", FieldOffset);
-  StringRef Name = getBytesAsCString(FieldData);
-  FieldData = FieldData.drop_front(Name.size() + 1);
-  W.printString("Name", Name);
+  printMemberAttributes(Field.getAccess(), MethodKind::Vanilla,
+                        MethodOptions::None);
+  printTypeIndex("Type", Field.getType());
+  W.printHex("FieldOffset", Field.getFieldOffset());
+  W.printString("Name", Field.getName());
+  Name = Field.getName();
 }
 
-void CVTypeDumperImpl::visitStaticDataMember(TypeLeafKind Leaf,
-                                             const StaticDataMember *Field,
-                                             ArrayRef<uint8_t> &FieldData) {
+void CVTypeDumperImpl::visitStaticDataMemberRecord(
+    TypeLeafKind Leaf, StaticDataMemberRecord &Field) {
   DictScope S(W, "StaticDataMember");
-  printMemberAttributes(Field->Attrs);
-  printTypeIndex("Type", Field->Type);
-  StringRef Name = getBytesAsCString(FieldData);
-  FieldData = FieldData.drop_front(Name.size() + 1);
-  W.printString("Name", Name);
+  printMemberAttributes(Field.getAccess(), MethodKind::Vanilla,
+                        MethodOptions::None);
+  printTypeIndex("Type", Field.getType());
+  W.printString("Name", Field.getName());
+  Name = Field.getName();
 }
 
-void CVTypeDumperImpl::visitVirtualFunctionPointer(
-    TypeLeafKind Leaf, const VirtualFunctionPointer *VFTable,
-    ArrayRef<uint8_t> &FieldData) {
+void CVTypeDumperImpl::visitVirtualFunctionPointerRecord(
+    TypeLeafKind Leaf, VirtualFunctionPointerRecord &VFTable) {
   DictScope S(W, "VirtualFunctionPointer");
-  printTypeIndex("Type", VFTable->Type);
+  printTypeIndex("Type", VFTable.getType());
 }
 
-void CVTypeDumperImpl::visitEnumerator(TypeLeafKind Leaf,
-                                       const Enumerator *Enum,
-                                       ArrayRef<uint8_t> &FieldData) {
+void CVTypeDumperImpl::visitEnumeratorRecord(TypeLeafKind Leaf,
+                                             EnumeratorRecord &Enum) {
   DictScope S(W, "Enumerator");
-  printMemberAttributes(Enum->Attrs);
-  APSInt EnumValue;
-  if (!decodeNumericLeaf(FieldData, EnumValue))
-    return parseError();
-  W.printNumber("EnumValue", EnumValue);
-  StringRef Name = getBytesAsCString(FieldData);
-  FieldData = FieldData.drop_front(Name.size() + 1);
-  W.printString("Name", Name);
+  printMemberAttributes(Enum.getAccess(), MethodKind::Vanilla,
+                        MethodOptions::None);
+  W.printNumber("EnumValue", Enum.getValue());
+  W.printString("Name", Enum.getName());
+  Name = Enum.getName();
 }
 
-void CVTypeDumperImpl::visitBaseClass(TypeLeafKind Leaf, const BaseClass *Base,
-                                      ArrayRef<uint8_t> &FieldData) {
+void CVTypeDumperImpl::visitBaseClassRecord(TypeLeafKind Leaf,
+                                            BaseClassRecord &Base) {
   DictScope S(W, "BaseClass");
-  printMemberAttributes(Base->Attrs);
-  printTypeIndex("BaseType", Base->BaseType);
-  uint64_t BaseOffset;
-  if (!decodeUIntLeaf(FieldData, BaseOffset))
-    return parseError();
-  W.printHex("BaseOffset", BaseOffset);
+  printMemberAttributes(Base.getAccess(), MethodKind::Vanilla,
+                        MethodOptions::None);
+  printTypeIndex("BaseType", Base.getBaseType());
+  W.printHex("BaseOffset", Base.getBaseOffset());
 }
 
-void CVTypeDumperImpl::visitVirtualBaseClass(TypeLeafKind Leaf,
-                                             const VirtualBaseClass *Base,
-                                             ArrayRef<uint8_t> &FieldData) {
+void CVTypeDumperImpl::visitVirtualBaseClassRecord(
+    TypeLeafKind Leaf, VirtualBaseClassRecord &Base) {
   DictScope S(W, "VirtualBaseClass");
-  printMemberAttributes(Base->Attrs);
-  printTypeIndex("BaseType", Base->BaseType);
-  printTypeIndex("VBPtrType", Base->VBPtrType);
-  uint64_t VBPtrOffset, VBTableIndex;
-  if (!decodeUIntLeaf(FieldData, VBPtrOffset))
-    return parseError();
-  if (!decodeUIntLeaf(FieldData, VBTableIndex))
-    return parseError();
-  W.printHex("VBPtrOffset", VBPtrOffset);
-  W.printHex("VBTableIndex", VBTableIndex);
+  printMemberAttributes(Base.getAccess(), MethodKind::Vanilla,
+                        MethodOptions::None);
+  printTypeIndex("BaseType", Base.getBaseType());
+  printTypeIndex("VBPtrType", Base.getVBPtrType());
+  W.printHex("VBPtrOffset", Base.getVBPtrOffset());
+  W.printHex("VBTableIndex", Base.getVTableIndex());
 }
 
 StringRef CVTypeDumper::getTypeName(TypeIndex TI) {
   if (TI.isNoType())
     return "<no type>";
 
   if (TI.isSimple()) {
     // This is a simple type.

lib/DebugInfo/CodeView/TypeStream.cpp

 //===-- TypeStream.cpp ----------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Utilities for parsing CodeView type streams.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/APInt.h"
 #include "llvm/ADT/APSInt.h"
-#include "llvm/DebugInfo/CodeView/TypeStream.h"
+#include "llvm/DebugInfo/CodeView/TypeRecord.h"
 
 using namespace llvm;
 using namespace llvm::codeview;
 using namespace llvm::support;
 
 bool llvm::codeview::decodeNumericLeaf(ArrayRef<uint8_t> &Data, APSInt &Num) {
   // Used to avoid overload ambiguity on APInt construtor.
   bool FalseVal = false;

lib/DebugInfo/CodeView/TypeTableBuilder.cpp

 #include "llvm/DebugInfo/CodeView/MethodListRecordBuilder.h"
 #include "llvm/DebugInfo/CodeView/TypeIndex.h"
 #include "llvm/DebugInfo/CodeView/TypeRecordBuilder.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;
 using namespace codeview;
 
-namespace {
-
-const int PointerKindShift = 0;
-const int PointerModeShift = 5;
-const int PointerSizeShift = 13;
-
-const int ClassHfaKindShift = 11;
-const int ClassWindowsRTClassKindShift = 14;
-
-void writePointerBase(TypeRecordBuilder &Builder,
-                      const PointerRecordBase &Record) {
-  Builder.writeTypeIndex(Record.getReferentType());
-  uint32_t flags =
-      static_cast<uint32_t>(Record.getOptions()) |
-      (Record.getSize() << PointerSizeShift) |
-      (static_cast<uint32_t>(Record.getMode()) << PointerModeShift) |
-      (static_cast<uint32_t>(Record.getPointerKind()) << PointerKindShift);
-  Builder.writeUInt32(flags);
-}
-}
-
 TypeTableBuilder::TypeTableBuilder() {}
 
 TypeTableBuilder::~TypeTableBuilder() {}
 
 TypeIndex TypeTableBuilder::writeModifier(const ModifierRecord &Record) {
   TypeRecordBuilder Builder(TypeRecordKind::Modifier);
 
   Builder.writeTypeIndex(Record.getModifiedType());
-  Builder.writeUInt16(static_cast<uint16_t>(Record.getOptions()));
+  Builder.writeUInt16(static_cast<uint16_t>(Record.getModifiers()));
 
   return writeRecord(Builder);
 }
 
 TypeIndex TypeTableBuilder::writeProcedure(const ProcedureRecord &Record) {
   TypeRecordBuilder Builder(TypeRecordKind::Procedure);
 
   Builder.writeTypeIndex(Record.getReturnType());
TypeTableBuilder::writeMemberFunction(const MemberFunctionRecord &Record) {
   Builder.writeUInt8(static_cast<uint8_t>(Record.getOptions()));
   Builder.writeUInt16(Record.getParameterCount());
   Builder.writeTypeIndex(Record.getArgumentList());
   Builder.writeInt32(Record.getThisPointerAdjustment());
 
   return writeRecord(Builder);
 }
 
-TypeIndex
-TypeTableBuilder::writeArgumentList(const ArgumentListRecord &Record) {
+TypeIndex TypeTableBuilder::writeArgumentList(const StringListRecord &Record) {
   TypeRecordBuilder Builder(TypeRecordKind::ArgumentList);
 
-  Builder.writeUInt32(Record.getArgumentTypes().size());
-  for (TypeIndex TI : Record.getArgumentTypes()) {
+  Builder.writeUInt32(Record.getIndices().size());
+  for (TypeIndex TI : Record.getIndices()) {
     Builder.writeTypeIndex(TI);
   }
 
   return writeRecord(Builder);
 }
 
 TypeIndex TypeTableBuilder::writePointer(const PointerRecord &Record) {
   TypeRecordBuilder Builder(TypeRecordKind::Pointer);
 
-  writePointerBase(Builder, Record);
+  Builder.writeTypeIndex(Record.getReferentType());
+  uint32_t flags = static_cast<uint32_t>(Record.getOptions()) |
+                   (Record.getSize() << PointerRecord::PointerSizeShift) |
+                   (static_cast<uint32_t>(Record.getMode())
+                    << PointerRecord::PointerModeShift) |
+                   (static_cast<uint32_t>(Record.getPointerKind())
+                    << PointerRecord::PointerKindShift);
+  Builder.writeUInt32(flags);
 
-  return writeRecord(Builder);
+  if (Record.isPointerToMember()) {
+    const MemberPointerInfo &M = Record.getMemberInfo();
+    Builder.writeTypeIndex(M.getContainingType());
+    Builder.writeUInt16(static_cast<uint16_t>(M.getRepresentation()));
   }
 
-TypeIndex
-TypeTableBuilder::writePointerToMember(const PointerToMemberRecord &Record) {
-  TypeRecordBuilder Builder(TypeRecordKind::Pointer);
-
-  writePointerBase(Builder, Record);
-
-  Builder.writeTypeIndex(Record.getContainingType());
-  Builder.writeUInt16(static_cast<uint16_t>(Record.getRepresentation()));
-
   return writeRecord(Builder);
 }
 
 TypeIndex TypeTableBuilder::writeArray(const ArrayRecord &Record) {
   TypeRecordBuilder Builder(TypeRecordKind::Array);
 
   Builder.writeTypeIndex(Record.getElementType());
   Builder.writeTypeIndex(Record.getIndexType());
   Builder.writeEncodedUnsignedInteger(Record.getSize());
   Builder.writeNullTerminatedString(Record.getName());
 
   return writeRecord(Builder);
 }
 
-TypeIndex TypeTableBuilder::writeAggregate(const AggregateRecord &Record) {
+TypeIndex TypeTableBuilder::writeClass(const ClassRecord &Record) {
   assert((Record.getKind() == TypeRecordKind::Structure) ||
          (Record.getKind() == TypeRecordKind::Class) ||
          (Record.getKind() == TypeRecordKind::Union));
 
   TypeRecordBuilder Builder(Record.getKind());
 
   Builder.writeUInt16(Record.getMemberCount());
   uint16_t Flags =
       static_cast<uint16_t>(Record.getOptions()) |
-      (static_cast<uint16_t>(Record.getHfa()) << ClassHfaKindShift) |
+      (static_cast<uint16_t>(Record.getHfa()) << ClassRecord::HfaKindShift) |
       (static_cast<uint16_t>(Record.getWinRTKind())
-       << ClassWindowsRTClassKindShift);
+       << ClassRecord::WinRTKindShift);
   Builder.writeUInt16(Flags);
   Builder.writeTypeIndex(Record.getFieldList());
-  if (Record.getKind() != TypeRecordKind::Union) {
-    Builder.writeTypeIndex(Record.getDerivationList());
-    Builder.writeTypeIndex(Record.getVTableShape());
-  } else {
-    assert(Record.getDerivationList() == TypeIndex());
-    assert(Record.getVTableShape() == TypeIndex());
-  }
   Builder.writeEncodedUnsignedInteger(Record.getSize());
   Builder.writeNullTerminatedString(Record.getName());
   if ((Record.getOptions() & ClassOptions::HasUniqueName) !=
       ClassOptions::None) {
     Builder.writeNullTerminatedString(Record.getUniqueName());
   }
 
   return writeRecord(Builder);