[llvm] r304278 - [ObjectYAML] Split CodeViewYAML into 3 pieces.

Zachary Turner via llvm-commits llvm-commits at lists.llvm.org
Tue May 30 21:17:13 PDT 2017


Author: zturner
Date: Tue May 30 23:17:13 2017
New Revision: 304278

URL: http://llvm.org/viewvc/llvm-project?rev=304278&view=rev
Log:
[ObjectYAML] Split CodeViewYAML into 3 pieces.

The code was a mess and disorganized due to the sheer amount
of it being in one file.  So I'm splitting this into three files.
One for CodeView types, one for CodeView symbols, and one for
CodeView debug subsections.  NFC.

Added:
    llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLDebugSections.h
    llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLSymbols.h
    llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLTypes.h
    llvm/trunk/lib/ObjectYAML/CodeViewYAMLDebugSections.cpp
    llvm/trunk/lib/ObjectYAML/CodeViewYAMLSymbols.cpp
    llvm/trunk/lib/ObjectYAML/CodeViewYAMLTypes.cpp
Removed:
    llvm/trunk/include/llvm/ObjectYAML/CodeViewYAML.h
    llvm/trunk/lib/ObjectYAML/CodeViewYAML.cpp
Modified:
    llvm/trunk/lib/ObjectYAML/CMakeLists.txt
    llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp
    llvm/trunk/tools/llvm-pdbdump/PdbYaml.h
    llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.cpp
    llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp

Removed: llvm/trunk/include/llvm/ObjectYAML/CodeViewYAML.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ObjectYAML/CodeViewYAML.h?rev=304277&view=auto
==============================================================================
--- llvm/trunk/include/llvm/ObjectYAML/CodeViewYAML.h (original)
+++ llvm/trunk/include/llvm/ObjectYAML/CodeViewYAML.h (removed)
@@ -1,132 +0,0 @@
-//===- CodeViewYAML.cpp - CodeView YAMLIO implementation ------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines classes for handling the YAML representation of CodeView
-// Debug Info.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_OBJECTYAML_CODEVIEWYAML_H
-#define LLVM_OBJECTYAML_CODEVIEWYAML_H
-
-#include "llvm/DebugInfo/CodeView/CodeView.h"
-#include "llvm/DebugInfo/CodeView/DebugSubsection.h"
-#include "llvm/DebugInfo/CodeView/SymbolDeserializer.h"
-#include "llvm/DebugInfo/CodeView/SymbolRecord.h"
-#include "llvm/DebugInfo/CodeView/SymbolSerializer.h"
-#include "llvm/DebugInfo/CodeView/TypeDeserializer.h"
-#include "llvm/DebugInfo/CodeView/TypeRecord.h"
-#include "llvm/DebugInfo/CodeView/TypeSerializer.h"
-#include "llvm/DebugInfo/CodeView/TypeTableBuilder.h"
-#include "llvm/ObjectYAML/YAML.h"
-
-namespace llvm {
-namespace CodeViewYAML {
-namespace detail {
-struct C13FragmentBase;
-struct LeafRecordBase;
-struct MemberRecordBase;
-struct SymbolRecordBase;
-}
-
-namespace detail {
-struct MemberRecordBase;
-struct LeafRecordBase;
-struct SymbolRecordBase;
-}
-
-struct SourceLineEntry {
-  uint32_t Offset;
-  uint32_t LineStart;
-  uint32_t EndDelta;
-  bool IsStatement;
-};
-
-struct SourceColumnEntry {
-  uint16_t StartColumn;
-  uint16_t EndColumn;
-};
-
-struct SourceLineBlock {
-  StringRef FileName;
-  std::vector<SourceLineEntry> Lines;
-  std::vector<SourceColumnEntry> Columns;
-};
-
-struct HexFormattedString {
-  std::vector<uint8_t> Bytes;
-};
-
-struct SourceFileChecksumEntry {
-  StringRef FileName;
-  codeview::FileChecksumKind Kind;
-  HexFormattedString ChecksumBytes;
-};
-
-struct SourceLineInfo {
-  uint32_t RelocOffset;
-  uint32_t RelocSegment;
-  codeview::LineFlags Flags;
-  uint32_t CodeSize;
-
-  std::vector<SourceLineBlock> Blocks;
-};
-
-struct InlineeSite {
-  uint32_t Inlinee;
-  StringRef FileName;
-  uint32_t SourceLineNum;
-  std::vector<StringRef> ExtraFiles;
-};
-
-struct InlineeInfo {
-  bool HasExtraFiles;
-  std::vector<InlineeSite> Sites;
-};
-
-struct SourceFileInfo {
-  std::vector<SourceFileChecksumEntry> FileChecksums;
-  std::vector<SourceLineInfo> LineFragments;
-  std::vector<InlineeInfo> Inlinees;
-};
-
-struct MemberRecord {
-  std::shared_ptr<detail::MemberRecordBase> Member;
-};
-
-struct LeafRecord {
-  std::shared_ptr<detail::LeafRecordBase> Leaf;
-
-  codeview::CVType toCodeViewRecord(BumpPtrAllocator &Allocator) const;
-  static Expected<LeafRecord> fromCodeViewRecord(codeview::CVType Type);
-};
-
-struct SymbolRecord {
-  std::shared_ptr<detail::SymbolRecordBase> Symbol;
-
-  codeview::CVSymbol toCodeViewSymbol(BumpPtrAllocator &Allocator) const;
-  static Expected<SymbolRecord> fromCodeViewSymbol(codeview::CVSymbol Symbol);
-};
-
-struct C13DebugSection {
-  std::vector<detail::C13FragmentBase> Fragments;
-};
-} // namespace CodeViewYAML
-} // namespace llvm
-
-LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::LeafRecord)
-LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::MemberRecord)
-LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SymbolRecord)
-LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SourceFileInfo)
-
-LLVM_YAML_IS_SEQUENCE_VECTOR(CodeViewYAML::LeafRecord)
-LLVM_YAML_IS_SEQUENCE_VECTOR(CodeViewYAML::MemberRecord)
-LLVM_YAML_IS_SEQUENCE_VECTOR(CodeViewYAML::SymbolRecord)
-
-#endif

Added: llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLDebugSections.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLDebugSections.h?rev=304278&view=auto
==============================================================================
--- llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLDebugSections.h (added)
+++ llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLDebugSections.h Tue May 30 23:17:13 2017
@@ -0,0 +1,91 @@
+//===- CodeViewYAMLDebugSections.h - CodeView YAMLIO debug sections -------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines classes for handling the YAML representation of CodeView
+// Debug Info.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_OBJECTYAML_CODEVIEWYAMLDEBUGSECTIONS_H
+#define LLVM_OBJECTYAML_CODEVIEWYAMLDEBUGSECTIONS_H
+
+#include "llvm/DebugInfo/CodeView/CodeView.h"
+#include "llvm/DebugInfo/CodeView/DebugSubsection.h"
+#include "llvm/ObjectYAML/YAML.h"
+
+namespace llvm {
+namespace CodeViewYAML {
+namespace detail {
+struct C13FragmentBase;
+}
+
+struct SourceLineEntry {
+  uint32_t Offset;
+  uint32_t LineStart;
+  uint32_t EndDelta;
+  bool IsStatement;
+};
+
+struct SourceColumnEntry {
+  uint16_t StartColumn;
+  uint16_t EndColumn;
+};
+
+struct SourceLineBlock {
+  StringRef FileName;
+  std::vector<SourceLineEntry> Lines;
+  std::vector<SourceColumnEntry> Columns;
+};
+
+struct HexFormattedString {
+  std::vector<uint8_t> Bytes;
+};
+
+struct SourceFileChecksumEntry {
+  StringRef FileName;
+  codeview::FileChecksumKind Kind;
+  HexFormattedString ChecksumBytes;
+};
+
+struct SourceLineInfo {
+  uint32_t RelocOffset;
+  uint32_t RelocSegment;
+  codeview::LineFlags Flags;
+  uint32_t CodeSize;
+
+  std::vector<SourceLineBlock> Blocks;
+};
+
+struct InlineeSite {
+  uint32_t Inlinee;
+  StringRef FileName;
+  uint32_t SourceLineNum;
+  std::vector<StringRef> ExtraFiles;
+};
+
+struct InlineeInfo {
+  bool HasExtraFiles;
+  std::vector<InlineeSite> Sites;
+};
+
+struct SourceFileInfo {
+  std::vector<SourceFileChecksumEntry> FileChecksums;
+  std::vector<SourceLineInfo> LineFragments;
+  std::vector<InlineeInfo> Inlinees;
+};
+
+struct C13DebugSection {
+  std::vector<detail::C13FragmentBase> Fragments;
+};
+} // namespace CodeViewYAML
+} // namespace llvm
+
+LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SourceFileInfo)
+
+#endif

Added: llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLSymbols.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLSymbols.h?rev=304278&view=auto
==============================================================================
--- llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLSymbols.h (added)
+++ llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLSymbols.h Tue May 30 23:17:13 2017
@@ -0,0 +1,41 @@
+//===- CodeViewYAMLSymbols.h - CodeView YAMLIO Symbol implementation ------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines classes for handling the YAML representation of CodeView
+// Debug Info.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_OBJECTYAML_CODEVIEWYAMLSYMBOLS_H
+#define LLVM_OBJECTYAML_CODEVIEWYAMLSYMBOLS_H
+
+#include "llvm/DebugInfo/CodeView/CodeView.h"
+#include "llvm/DebugInfo/CodeView/SymbolRecord.h"
+#include "llvm/ObjectYAML/YAML.h"
+
+namespace llvm {
+namespace CodeViewYAML {
+namespace detail {
+struct SymbolRecordBase;
+}
+
+struct SymbolRecord {
+  std::shared_ptr<detail::SymbolRecordBase> Symbol;
+
+  codeview::CVSymbol toCodeViewSymbol(BumpPtrAllocator &Allocator) const;
+  static Expected<SymbolRecord> fromCodeViewSymbol(codeview::CVSymbol Symbol);
+};
+
+} // namespace CodeViewYAML
+} // namespace llvm
+
+LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SymbolRecord)
+LLVM_YAML_IS_SEQUENCE_VECTOR(CodeViewYAML::SymbolRecord)
+
+#endif

Added: llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLTypes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLTypes.h?rev=304278&view=auto
==============================================================================
--- llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLTypes.h (added)
+++ llvm/trunk/include/llvm/ObjectYAML/CodeViewYAMLTypes.h Tue May 30 23:17:13 2017
@@ -0,0 +1,48 @@
+//===- CodeViewYAMLTypes.h - CodeView YAMLIO Type Record implementation ---===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines classes for handling the YAML representation of CodeView
+// Debug Info.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_OBJECTYAML_CODEVIEWYAMLTYPES_H
+#define LLVM_OBJECTYAML_CODEVIEWYAMLTYPES_H
+
+#include "llvm/DebugInfo/CodeView/CodeView.h"
+#include "llvm/DebugInfo/CodeView/TypeRecord.h"
+#include "llvm/ObjectYAML/YAML.h"
+
+namespace llvm {
+namespace CodeViewYAML {
+namespace detail {
+struct LeafRecordBase;
+struct MemberRecordBase;
+}
+
+struct MemberRecord {
+  std::shared_ptr<detail::MemberRecordBase> Member;
+};
+
+struct LeafRecord {
+  std::shared_ptr<detail::LeafRecordBase> Leaf;
+
+  codeview::CVType toCodeViewRecord(BumpPtrAllocator &Allocator) const;
+  static Expected<LeafRecord> fromCodeViewRecord(codeview::CVType Type);
+};
+} // namespace CodeViewYAML
+} // namespace llvm
+
+LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::LeafRecord)
+LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::MemberRecord)
+
+LLVM_YAML_IS_SEQUENCE_VECTOR(CodeViewYAML::LeafRecord)
+LLVM_YAML_IS_SEQUENCE_VECTOR(CodeViewYAML::MemberRecord)
+
+#endif

Modified: llvm/trunk/lib/ObjectYAML/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/CMakeLists.txt?rev=304278&r1=304277&r2=304278&view=diff
==============================================================================
--- llvm/trunk/lib/ObjectYAML/CMakeLists.txt (original)
+++ llvm/trunk/lib/ObjectYAML/CMakeLists.txt Tue May 30 23:17:13 2017
@@ -1,5 +1,7 @@
 add_llvm_library(LLVMObjectYAML
-  CodeViewYAML.cpp
+  CodeViewYAMLTypes.cpp
+  CodeViewYAMLSymbols.cpp
+  CodeViewYAMLDebugSections.cpp
   COFFYAML.cpp
   DWARFEmitter.cpp
   DWARFVisitor.cpp

Removed: llvm/trunk/lib/ObjectYAML/CodeViewYAML.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/CodeViewYAML.cpp?rev=304277&view=auto
==============================================================================
--- llvm/trunk/lib/ObjectYAML/CodeViewYAML.cpp (original)
+++ llvm/trunk/lib/ObjectYAML/CodeViewYAML.cpp (removed)
@@ -1,1266 +0,0 @@
-//===- CodeViewYAML.cpp - CodeView YAMLIO implementation ------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines classes for handling the YAML representation of CodeView
-// Debug Info.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ObjectYAML/CodeViewYAML.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/StringSwitch.h"
-#include "llvm/DebugInfo/CodeView/CVTypeVisitor.h"
-#include "llvm/DebugInfo/CodeView/CodeViewError.h"
-#include "llvm/DebugInfo/CodeView/EnumTables.h"
-
-using namespace llvm;
-using namespace llvm::codeview;
-using namespace llvm::CodeViewYAML;
-using namespace llvm::CodeViewYAML::detail;
-using namespace llvm::yaml;
-
-LLVM_YAML_IS_SEQUENCE_VECTOR(SourceFileChecksumEntry)
-LLVM_YAML_IS_SEQUENCE_VECTOR(SourceLineEntry)
-LLVM_YAML_IS_SEQUENCE_VECTOR(SourceColumnEntry)
-LLVM_YAML_IS_SEQUENCE_VECTOR(SourceLineBlock)
-LLVM_YAML_IS_SEQUENCE_VECTOR(SourceLineInfo)
-LLVM_YAML_IS_SEQUENCE_VECTOR(InlineeSite)
-LLVM_YAML_IS_SEQUENCE_VECTOR(InlineeInfo)
-LLVM_YAML_IS_SEQUENCE_VECTOR(OneMethodRecord)
-LLVM_YAML_IS_SEQUENCE_VECTOR(StringRef)
-LLVM_YAML_IS_SEQUENCE_VECTOR(VFTableSlotKind)
-LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(TypeIndex)
-
-LLVM_YAML_DECLARE_SCALAR_TRAITS(TypeIndex, false)
-LLVM_YAML_DECLARE_SCALAR_TRAITS(CodeViewYAML::HexFormattedString, false)
-LLVM_YAML_DECLARE_SCALAR_TRAITS(APSInt, false)
-
-LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SourceLineEntry)
-LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SourceColumnEntry)
-LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SourceFileChecksumEntry)
-LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SourceLineInfo)
-LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SourceLineBlock)
-LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::InlineeInfo)
-LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::InlineeSite)
-
-LLVM_YAML_DECLARE_ENUM_TRAITS(TypeLeafKind)
-LLVM_YAML_DECLARE_ENUM_TRAITS(SymbolKind)
-LLVM_YAML_DECLARE_ENUM_TRAITS(PointerToMemberRepresentation)
-LLVM_YAML_DECLARE_ENUM_TRAITS(VFTableSlotKind)
-LLVM_YAML_DECLARE_ENUM_TRAITS(CallingConvention)
-LLVM_YAML_DECLARE_ENUM_TRAITS(PointerKind)
-LLVM_YAML_DECLARE_ENUM_TRAITS(PointerMode)
-LLVM_YAML_DECLARE_ENUM_TRAITS(HfaKind)
-LLVM_YAML_DECLARE_ENUM_TRAITS(MemberAccess)
-LLVM_YAML_DECLARE_ENUM_TRAITS(MethodKind)
-LLVM_YAML_DECLARE_ENUM_TRAITS(WindowsRTClassKind)
-LLVM_YAML_DECLARE_ENUM_TRAITS(LabelType)
-LLVM_YAML_DECLARE_ENUM_TRAITS(FileChecksumKind)
-
-LLVM_YAML_DECLARE_BITSET_TRAITS(PointerOptions)
-LLVM_YAML_DECLARE_BITSET_TRAITS(LineFlags)
-LLVM_YAML_DECLARE_BITSET_TRAITS(ModifierOptions)
-LLVM_YAML_DECLARE_BITSET_TRAITS(FunctionOptions)
-LLVM_YAML_DECLARE_BITSET_TRAITS(ClassOptions)
-LLVM_YAML_DECLARE_BITSET_TRAITS(MethodOptions)
-
-LLVM_YAML_DECLARE_MAPPING_TRAITS(llvm::codeview::OneMethodRecord)
-LLVM_YAML_DECLARE_MAPPING_TRAITS(llvm::codeview::MemberPointerInfo)
-
-LLVM_YAML_DECLARE_BITSET_TRAITS(CompileSym2Flags)
-LLVM_YAML_DECLARE_BITSET_TRAITS(CompileSym3Flags)
-LLVM_YAML_DECLARE_BITSET_TRAITS(ExportFlags)
-LLVM_YAML_DECLARE_BITSET_TRAITS(LocalSymFlags)
-LLVM_YAML_DECLARE_BITSET_TRAITS(ProcSymFlags)
-LLVM_YAML_DECLARE_BITSET_TRAITS(FrameProcedureOptions)
-LLVM_YAML_DECLARE_ENUM_TRAITS(CPUType)
-LLVM_YAML_DECLARE_ENUM_TRAITS(RegisterId)
-LLVM_YAML_DECLARE_ENUM_TRAITS(TrampolineType)
-LLVM_YAML_DECLARE_ENUM_TRAITS(ThunkOrdinal)
-
-namespace llvm {
-namespace CodeViewYAML {
-namespace detail {
-
-struct LeafRecordBase {
-  TypeLeafKind Kind;
-  explicit LeafRecordBase(TypeLeafKind K) : Kind(K) {}
-
-  virtual ~LeafRecordBase() {}
-  virtual void map(yaml::IO &io) = 0;
-  virtual CVType toCodeViewRecord(BumpPtrAllocator &Allocator) const = 0;
-  virtual Error fromCodeViewRecord(CVType Type) = 0;
-};
-
-template <typename T> struct LeafRecordImpl : public LeafRecordBase {
-  explicit LeafRecordImpl(TypeLeafKind K)
-      : LeafRecordBase(K), Record(static_cast<TypeRecordKind>(K)) {}
-
-  void map(yaml::IO &io) override;
-
-  Error fromCodeViewRecord(CVType Type) override {
-    return TypeDeserializer::deserializeAs<T>(Type, Record);
-  }
-
-  CVType toCodeViewRecord(BumpPtrAllocator &Allocator) const override {
-    TypeTableBuilder Table(Allocator);
-    Table.writeKnownType(Record);
-    return CVType(Kind, Table.records().front());
-  }
-
-  mutable T Record;
-};
-
-template <> struct LeafRecordImpl<FieldListRecord> : public LeafRecordBase {
-  explicit LeafRecordImpl(TypeLeafKind K) : LeafRecordBase(K) {}
-
-  void map(yaml::IO &io) override;
-  CVType toCodeViewRecord(BumpPtrAllocator &Allocator) const override;
-  Error fromCodeViewRecord(CVType Type) override;
-
-  std::vector<MemberRecord> Members;
-};
-
-struct MemberRecordBase {
-  TypeLeafKind Kind;
-  explicit MemberRecordBase(TypeLeafKind K) : Kind(K) {}
-
-  virtual ~MemberRecordBase() {}
-  virtual void map(yaml::IO &io) = 0;
-  virtual void writeTo(FieldListRecordBuilder &FLRB) = 0;
-};
-
-template <typename T> struct MemberRecordImpl : public MemberRecordBase {
-  explicit MemberRecordImpl(TypeLeafKind K)
-      : MemberRecordBase(K), Record(static_cast<TypeRecordKind>(K)) {}
-  void map(yaml::IO &io) override;
-
-  void writeTo(FieldListRecordBuilder &FLRB) override {
-    FLRB.writeMemberType(Record);
-  }
-
-  mutable T Record;
-};
-
-struct SymbolRecordBase {
-  codeview::SymbolKind Kind;
-  explicit SymbolRecordBase(codeview::SymbolKind K) : Kind(K) {}
-
-  virtual ~SymbolRecordBase() {}
-  virtual void map(yaml::IO &io) = 0;
-  virtual codeview::CVSymbol
-  toCodeViewSymbol(BumpPtrAllocator &Allocator) const = 0;
-  virtual Error fromCodeViewSymbol(codeview::CVSymbol Type) = 0;
-};
-
-template <typename T> struct SymbolRecordImpl : public SymbolRecordBase {
-  explicit SymbolRecordImpl(codeview::SymbolKind K)
-      : SymbolRecordBase(K), Symbol(static_cast<SymbolRecordKind>(K)) {}
-
-  void map(yaml::IO &io) override;
-
-  codeview::CVSymbol
-  toCodeViewSymbol(BumpPtrAllocator &Allocator) const override {
-    return SymbolSerializer::writeOneSymbol(Symbol, Allocator);
-  }
-  Error fromCodeViewSymbol(codeview::CVSymbol CVS) override {
-    return SymbolDeserializer::deserializeAs<T>(CVS, Symbol);
-  }
-
-  mutable T Symbol;
-};
-}
-}
-}
-
-void ScalarTraits<TypeIndex>::output(const TypeIndex &S, void *,
-                                     llvm::raw_ostream &OS) {
-  OS << S.getIndex();
-}
-
-StringRef ScalarTraits<TypeIndex>::input(StringRef Scalar, void *Ctx,
-                                         TypeIndex &S) {
-  uint32_t I;
-  StringRef Result = ScalarTraits<uint32_t>::input(Scalar, Ctx, I);
-  S.setIndex(I);
-  return Result;
-}
-
-void ScalarTraits<APSInt>::output(const APSInt &S, void *,
-                                  llvm::raw_ostream &OS) {
-  S.print(OS, true);
-}
-
-StringRef ScalarTraits<APSInt>::input(StringRef Scalar, void *Ctx, APSInt &S) {
-  S = APSInt(Scalar);
-  return "";
-}
-
-void ScalarEnumerationTraits<TypeLeafKind>::enumeration(IO &io,
-                                                        TypeLeafKind &Value) {
-#define CV_TYPE(name, val) io.enumCase(Value, #name, name);
-#include "llvm/DebugInfo/CodeView/CodeViewTypes.def"
-#undef CV_TYPE
-}
-
-void ScalarEnumerationTraits<PointerToMemberRepresentation>::enumeration(
-    IO &IO, PointerToMemberRepresentation &Value) {
-  IO.enumCase(Value, "Unknown", PointerToMemberRepresentation::Unknown);
-  IO.enumCase(Value, "SingleInheritanceData",
-              PointerToMemberRepresentation::SingleInheritanceData);
-  IO.enumCase(Value, "MultipleInheritanceData",
-              PointerToMemberRepresentation::MultipleInheritanceData);
-  IO.enumCase(Value, "VirtualInheritanceData",
-              PointerToMemberRepresentation::VirtualInheritanceData);
-  IO.enumCase(Value, "GeneralData", PointerToMemberRepresentation::GeneralData);
-  IO.enumCase(Value, "SingleInheritanceFunction",
-              PointerToMemberRepresentation::SingleInheritanceFunction);
-  IO.enumCase(Value, "MultipleInheritanceFunction",
-              PointerToMemberRepresentation::MultipleInheritanceFunction);
-  IO.enumCase(Value, "VirtualInheritanceFunction",
-              PointerToMemberRepresentation::VirtualInheritanceFunction);
-  IO.enumCase(Value, "GeneralFunction",
-              PointerToMemberRepresentation::GeneralFunction);
-}
-
-void ScalarEnumerationTraits<VFTableSlotKind>::enumeration(
-    IO &IO, VFTableSlotKind &Kind) {
-  IO.enumCase(Kind, "Near16", VFTableSlotKind::Near16);
-  IO.enumCase(Kind, "Far16", VFTableSlotKind::Far16);
-  IO.enumCase(Kind, "This", VFTableSlotKind::This);
-  IO.enumCase(Kind, "Outer", VFTableSlotKind::Outer);
-  IO.enumCase(Kind, "Meta", VFTableSlotKind::Meta);
-  IO.enumCase(Kind, "Near", VFTableSlotKind::Near);
-  IO.enumCase(Kind, "Far", VFTableSlotKind::Far);
-}
-
-void ScalarEnumerationTraits<CallingConvention>::enumeration(
-    IO &IO, CallingConvention &Value) {
-  IO.enumCase(Value, "NearC", CallingConvention::NearC);
-  IO.enumCase(Value, "FarC", CallingConvention::FarC);
-  IO.enumCase(Value, "NearPascal", CallingConvention::NearPascal);
-  IO.enumCase(Value, "FarPascal", CallingConvention::FarPascal);
-  IO.enumCase(Value, "NearFast", CallingConvention::NearFast);
-  IO.enumCase(Value, "FarFast", CallingConvention::FarFast);
-  IO.enumCase(Value, "NearStdCall", CallingConvention::NearStdCall);
-  IO.enumCase(Value, "FarStdCall", CallingConvention::FarStdCall);
-  IO.enumCase(Value, "NearSysCall", CallingConvention::NearSysCall);
-  IO.enumCase(Value, "FarSysCall", CallingConvention::FarSysCall);
-  IO.enumCase(Value, "ThisCall", CallingConvention::ThisCall);
-  IO.enumCase(Value, "MipsCall", CallingConvention::MipsCall);
-  IO.enumCase(Value, "Generic", CallingConvention::Generic);
-  IO.enumCase(Value, "AlphaCall", CallingConvention::AlphaCall);
-  IO.enumCase(Value, "PpcCall", CallingConvention::PpcCall);
-  IO.enumCase(Value, "SHCall", CallingConvention::SHCall);
-  IO.enumCase(Value, "ArmCall", CallingConvention::ArmCall);
-  IO.enumCase(Value, "AM33Call", CallingConvention::AM33Call);
-  IO.enumCase(Value, "TriCall", CallingConvention::TriCall);
-  IO.enumCase(Value, "SH5Call", CallingConvention::SH5Call);
-  IO.enumCase(Value, "M32RCall", CallingConvention::M32RCall);
-  IO.enumCase(Value, "ClrCall", CallingConvention::ClrCall);
-  IO.enumCase(Value, "Inline", CallingConvention::Inline);
-  IO.enumCase(Value, "NearVector", CallingConvention::NearVector);
-}
-
-void ScalarEnumerationTraits<PointerKind>::enumeration(IO &IO,
-                                                       PointerKind &Kind) {
-  IO.enumCase(Kind, "Near16", PointerKind::Near16);
-  IO.enumCase(Kind, "Far16", PointerKind::Far16);
-  IO.enumCase(Kind, "Huge16", PointerKind::Huge16);
-  IO.enumCase(Kind, "BasedOnSegment", PointerKind::BasedOnSegment);
-  IO.enumCase(Kind, "BasedOnValue", PointerKind::BasedOnValue);
-  IO.enumCase(Kind, "BasedOnSegmentValue", PointerKind::BasedOnSegmentValue);
-  IO.enumCase(Kind, "BasedOnAddress", PointerKind::BasedOnAddress);
-  IO.enumCase(Kind, "BasedOnSegmentAddress",
-              PointerKind::BasedOnSegmentAddress);
-  IO.enumCase(Kind, "BasedOnType", PointerKind::BasedOnType);
-  IO.enumCase(Kind, "BasedOnSelf", PointerKind::BasedOnSelf);
-  IO.enumCase(Kind, "Near32", PointerKind::Near32);
-  IO.enumCase(Kind, "Far32", PointerKind::Far32);
-  IO.enumCase(Kind, "Near64", PointerKind::Near64);
-}
-
-void ScalarEnumerationTraits<PointerMode>::enumeration(IO &IO,
-                                                       PointerMode &Mode) {
-  IO.enumCase(Mode, "Pointer", PointerMode::Pointer);
-  IO.enumCase(Mode, "LValueReference", PointerMode::LValueReference);
-  IO.enumCase(Mode, "PointerToDataMember", PointerMode::PointerToDataMember);
-  IO.enumCase(Mode, "PointerToMemberFunction",
-              PointerMode::PointerToMemberFunction);
-  IO.enumCase(Mode, "RValueReference", PointerMode::RValueReference);
-}
-
-void ScalarEnumerationTraits<HfaKind>::enumeration(IO &IO, HfaKind &Value) {
-  IO.enumCase(Value, "None", HfaKind::None);
-  IO.enumCase(Value, "Float", HfaKind::Float);
-  IO.enumCase(Value, "Double", HfaKind::Double);
-  IO.enumCase(Value, "Other", HfaKind::Other);
-}
-
-void ScalarEnumerationTraits<MemberAccess>::enumeration(IO &IO,
-                                                        MemberAccess &Access) {
-  IO.enumCase(Access, "None", MemberAccess::None);
-  IO.enumCase(Access, "Private", MemberAccess::Private);
-  IO.enumCase(Access, "Protected", MemberAccess::Protected);
-  IO.enumCase(Access, "Public", MemberAccess::Public);
-}
-
-void ScalarEnumerationTraits<MethodKind>::enumeration(IO &IO,
-                                                      MethodKind &Kind) {
-  IO.enumCase(Kind, "Vanilla", MethodKind::Vanilla);
-  IO.enumCase(Kind, "Virtual", MethodKind::Virtual);
-  IO.enumCase(Kind, "Static", MethodKind::Static);
-  IO.enumCase(Kind, "Friend", MethodKind::Friend);
-  IO.enumCase(Kind, "IntroducingVirtual", MethodKind::IntroducingVirtual);
-  IO.enumCase(Kind, "PureVirtual", MethodKind::PureVirtual);
-  IO.enumCase(Kind, "PureIntroducingVirtual",
-              MethodKind::PureIntroducingVirtual);
-}
-
-void ScalarEnumerationTraits<WindowsRTClassKind>::enumeration(
-    IO &IO, WindowsRTClassKind &Value) {
-  IO.enumCase(Value, "None", WindowsRTClassKind::None);
-  IO.enumCase(Value, "Ref", WindowsRTClassKind::RefClass);
-  IO.enumCase(Value, "Value", WindowsRTClassKind::ValueClass);
-  IO.enumCase(Value, "Interface", WindowsRTClassKind::Interface);
-}
-
-void ScalarEnumerationTraits<LabelType>::enumeration(IO &IO, LabelType &Value) {
-  IO.enumCase(Value, "Near", LabelType::Near);
-  IO.enumCase(Value, "Far", LabelType::Far);
-}
-
-void ScalarBitSetTraits<PointerOptions>::bitset(IO &IO,
-                                                PointerOptions &Options) {
-  IO.bitSetCase(Options, "None", PointerOptions::None);
-  IO.bitSetCase(Options, "Flat32", PointerOptions::Flat32);
-  IO.bitSetCase(Options, "Volatile", PointerOptions::Volatile);
-  IO.bitSetCase(Options, "Const", PointerOptions::Const);
-  IO.bitSetCase(Options, "Unaligned", PointerOptions::Unaligned);
-  IO.bitSetCase(Options, "Restrict", PointerOptions::Restrict);
-  IO.bitSetCase(Options, "WinRTSmartPointer",
-                PointerOptions::WinRTSmartPointer);
-}
-
-void ScalarBitSetTraits<ModifierOptions>::bitset(IO &IO,
-                                                 ModifierOptions &Options) {
-  IO.bitSetCase(Options, "None", ModifierOptions::None);
-  IO.bitSetCase(Options, "Const", ModifierOptions::Const);
-  IO.bitSetCase(Options, "Volatile", ModifierOptions::Volatile);
-  IO.bitSetCase(Options, "Unaligned", ModifierOptions::Unaligned);
-}
-
-void ScalarBitSetTraits<FunctionOptions>::bitset(IO &IO,
-                                                 FunctionOptions &Options) {
-  IO.bitSetCase(Options, "None", FunctionOptions::None);
-  IO.bitSetCase(Options, "CxxReturnUdt", FunctionOptions::CxxReturnUdt);
-  IO.bitSetCase(Options, "Constructor", FunctionOptions::Constructor);
-  IO.bitSetCase(Options, "ConstructorWithVirtualBases",
-                FunctionOptions::ConstructorWithVirtualBases);
-}
-
-void ScalarBitSetTraits<ClassOptions>::bitset(IO &IO, ClassOptions &Options) {
-  IO.bitSetCase(Options, "None", ClassOptions::None);
-  IO.bitSetCase(Options, "HasConstructorOrDestructor",
-                ClassOptions::HasConstructorOrDestructor);
-  IO.bitSetCase(Options, "HasOverloadedOperator",
-                ClassOptions::HasOverloadedOperator);
-  IO.bitSetCase(Options, "Nested", ClassOptions::Nested);
-  IO.bitSetCase(Options, "ContainsNestedClass",
-                ClassOptions::ContainsNestedClass);
-  IO.bitSetCase(Options, "HasOverloadedAssignmentOperator",
-                ClassOptions::HasOverloadedAssignmentOperator);
-  IO.bitSetCase(Options, "HasConversionOperator",
-                ClassOptions::HasConversionOperator);
-  IO.bitSetCase(Options, "ForwardReference", ClassOptions::ForwardReference);
-  IO.bitSetCase(Options, "Scoped", ClassOptions::Scoped);
-  IO.bitSetCase(Options, "HasUniqueName", ClassOptions::HasUniqueName);
-  IO.bitSetCase(Options, "Sealed", ClassOptions::Sealed);
-  IO.bitSetCase(Options, "Intrinsic", ClassOptions::Intrinsic);
-}
-
-void ScalarBitSetTraits<MethodOptions>::bitset(IO &IO, MethodOptions &Options) {
-  IO.bitSetCase(Options, "None", MethodOptions::None);
-  IO.bitSetCase(Options, "Pseudo", MethodOptions::Pseudo);
-  IO.bitSetCase(Options, "NoInherit", MethodOptions::NoInherit);
-  IO.bitSetCase(Options, "NoConstruct", MethodOptions::NoConstruct);
-  IO.bitSetCase(Options, "CompilerGenerated", MethodOptions::CompilerGenerated);
-  IO.bitSetCase(Options, "Sealed", MethodOptions::Sealed);
-}
-
-void ScalarEnumerationTraits<FileChecksumKind>::enumeration(
-    IO &io, FileChecksumKind &Kind) {
-  io.enumCase(Kind, "None", FileChecksumKind::None);
-  io.enumCase(Kind, "MD5", FileChecksumKind::MD5);
-  io.enumCase(Kind, "SHA1", FileChecksumKind::SHA1);
-  io.enumCase(Kind, "SHA256", FileChecksumKind::SHA256);
-}
-
-void ScalarBitSetTraits<LineFlags>::bitset(IO &io, LineFlags &Flags) {
-  io.bitSetCase(Flags, "HasColumnInfo", LF_HaveColumns);
-  io.enumFallback<Hex16>(Flags);
-}
-
-void ScalarEnumerationTraits<SymbolKind>::enumeration(IO &io,
-                                                      SymbolKind &Value) {
-  auto SymbolNames = getSymbolTypeNames();
-  for (const auto &E : SymbolNames)
-    io.enumCase(Value, E.Name.str().c_str(), E.Value);
-}
-
-void ScalarBitSetTraits<CompileSym2Flags>::bitset(IO &io,
-                                                  CompileSym2Flags &Flags) {
-  auto FlagNames = getCompileSym2FlagNames();
-  for (const auto &E : FlagNames) {
-    io.bitSetCase(Flags, E.Name.str().c_str(),
-                  static_cast<CompileSym2Flags>(E.Value));
-  }
-}
-
-void ScalarBitSetTraits<CompileSym3Flags>::bitset(IO &io,
-                                                  CompileSym3Flags &Flags) {
-  auto FlagNames = getCompileSym3FlagNames();
-  for (const auto &E : FlagNames) {
-    io.bitSetCase(Flags, E.Name.str().c_str(),
-                  static_cast<CompileSym3Flags>(E.Value));
-  }
-}
-
-void ScalarBitSetTraits<ExportFlags>::bitset(IO &io, ExportFlags &Flags) {
-  auto FlagNames = getExportSymFlagNames();
-  for (const auto &E : FlagNames) {
-    io.bitSetCase(Flags, E.Name.str().c_str(),
-                  static_cast<ExportFlags>(E.Value));
-  }
-}
-
-void ScalarBitSetTraits<LocalSymFlags>::bitset(IO &io, LocalSymFlags &Flags) {
-  auto FlagNames = getLocalFlagNames();
-  for (const auto &E : FlagNames) {
-    io.bitSetCase(Flags, E.Name.str().c_str(),
-                  static_cast<LocalSymFlags>(E.Value));
-  }
-}
-
-void ScalarBitSetTraits<ProcSymFlags>::bitset(IO &io, ProcSymFlags &Flags) {
-  auto FlagNames = getProcSymFlagNames();
-  for (const auto &E : FlagNames) {
-    io.bitSetCase(Flags, E.Name.str().c_str(),
-                  static_cast<ProcSymFlags>(E.Value));
-  }
-}
-
-void ScalarBitSetTraits<FrameProcedureOptions>::bitset(
-    IO &io, FrameProcedureOptions &Flags) {
-  auto FlagNames = getFrameProcSymFlagNames();
-  for (const auto &E : FlagNames) {
-    io.bitSetCase(Flags, E.Name.str().c_str(),
-                  static_cast<FrameProcedureOptions>(E.Value));
-  }
-}
-
-void ScalarEnumerationTraits<CPUType>::enumeration(IO &io, CPUType &Cpu) {
-  auto CpuNames = getCPUTypeNames();
-  for (const auto &E : CpuNames) {
-    io.enumCase(Cpu, E.Name.str().c_str(), static_cast<CPUType>(E.Value));
-  }
-}
-
-void ScalarEnumerationTraits<RegisterId>::enumeration(IO &io, RegisterId &Reg) {
-  auto RegNames = getRegisterNames();
-  for (const auto &E : RegNames) {
-    io.enumCase(Reg, E.Name.str().c_str(), static_cast<RegisterId>(E.Value));
-  }
-  io.enumFallback<Hex16>(Reg);
-}
-
-void ScalarEnumerationTraits<TrampolineType>::enumeration(
-    IO &io, TrampolineType &Tramp) {
-  auto TrampNames = getTrampolineNames();
-  for (const auto &E : TrampNames) {
-    io.enumCase(Tramp, E.Name.str().c_str(),
-                static_cast<TrampolineType>(E.Value));
-  }
-}
-
-void ScalarEnumerationTraits<ThunkOrdinal>::enumeration(IO &io,
-                                                        ThunkOrdinal &Ord) {
-  auto ThunkNames = getThunkOrdinalNames();
-  for (const auto &E : ThunkNames) {
-    io.enumCase(Ord, E.Name.str().c_str(), static_cast<ThunkOrdinal>(E.Value));
-  }
-}
-
-void ScalarTraits<HexFormattedString>::output(const HexFormattedString &Value,
-                                              void *ctx, raw_ostream &Out) {
-  StringRef Bytes(reinterpret_cast<const char *>(Value.Bytes.data()),
-                  Value.Bytes.size());
-  Out << toHex(Bytes);
-}
-
-StringRef ScalarTraits<HexFormattedString>::input(StringRef Scalar, void *ctxt,
-                                                  HexFormattedString &Value) {
-  std::string H = fromHex(Scalar);
-  Value.Bytes.assign(H.begin(), H.end());
-  return StringRef();
-}
-
-void MappingTraits<SourceLineEntry>::mapping(IO &IO, SourceLineEntry &Obj) {
-  IO.mapRequired("Offset", Obj.Offset);
-  IO.mapRequired("LineStart", Obj.LineStart);
-  IO.mapRequired("IsStatement", Obj.IsStatement);
-  IO.mapRequired("EndDelta", Obj.EndDelta);
-}
-
-void MappingTraits<SourceColumnEntry>::mapping(IO &IO, SourceColumnEntry &Obj) {
-  IO.mapRequired("StartColumn", Obj.StartColumn);
-  IO.mapRequired("EndColumn", Obj.EndColumn);
-}
-
-void MappingTraits<SourceLineBlock>::mapping(IO &IO, SourceLineBlock &Obj) {
-  IO.mapRequired("FileName", Obj.FileName);
-  IO.mapRequired("Lines", Obj.Lines);
-  IO.mapRequired("Columns", Obj.Columns);
-}
-
-void MappingTraits<SourceFileChecksumEntry>::mapping(
-    IO &IO, SourceFileChecksumEntry &Obj) {
-  IO.mapRequired("FileName", Obj.FileName);
-  IO.mapRequired("Kind", Obj.Kind);
-  IO.mapRequired("Checksum", Obj.ChecksumBytes);
-}
-
-void MappingTraits<SourceLineInfo>::mapping(IO &IO, SourceLineInfo &Obj) {
-  IO.mapRequired("CodeSize", Obj.CodeSize);
-
-  IO.mapRequired("Flags", Obj.Flags);
-  IO.mapRequired("RelocOffset", Obj.RelocOffset);
-  IO.mapRequired("RelocSegment", Obj.RelocSegment);
-  IO.mapRequired("Blocks", Obj.Blocks);
-}
-
-void MappingTraits<SourceFileInfo>::mapping(IO &IO, SourceFileInfo &Obj) {
-  IO.mapOptional("Checksums", Obj.FileChecksums);
-  IO.mapOptional("Lines", Obj.LineFragments);
-  IO.mapOptional("InlineeLines", Obj.Inlinees);
-}
-
-void MappingTraits<InlineeSite>::mapping(IO &IO, InlineeSite &Obj) {
-  IO.mapRequired("FileName", Obj.FileName);
-  IO.mapRequired("LineNum", Obj.SourceLineNum);
-  IO.mapRequired("Inlinee", Obj.Inlinee);
-  IO.mapOptional("ExtraFiles", Obj.ExtraFiles);
-}
-
-void MappingTraits<InlineeInfo>::mapping(IO &IO, InlineeInfo &Obj) {
-  IO.mapRequired("HasExtraFiles", Obj.HasExtraFiles);
-  IO.mapRequired("Sites", Obj.Sites);
-}
-
-void MappingTraits<MemberPointerInfo>::mapping(IO &IO, MemberPointerInfo &MPI) {
-  IO.mapRequired("ContainingType", MPI.ContainingType);
-  IO.mapRequired("Representation", MPI.Representation);
-}
-
-namespace llvm {
-namespace CodeViewYAML {
-namespace detail {
-template <> void LeafRecordImpl<ModifierRecord>::map(IO &IO) {
-  IO.mapRequired("ModifiedType", Record.ModifiedType);
-  IO.mapRequired("Modifiers", Record.Modifiers);
-}
-
-template <> void LeafRecordImpl<ProcedureRecord>::map(IO &IO) {
-  IO.mapRequired("ReturnType", Record.ReturnType);
-  IO.mapRequired("CallConv", Record.CallConv);
-  IO.mapRequired("Options", Record.Options);
-  IO.mapRequired("ParameterCount", Record.ParameterCount);
-  IO.mapRequired("ArgumentList", Record.ArgumentList);
-}
-
-template <> void LeafRecordImpl<MemberFunctionRecord>::map(IO &IO) {
-  IO.mapRequired("ReturnType", Record.ReturnType);
-  IO.mapRequired("ClassType", Record.ClassType);
-  IO.mapRequired("ThisType", Record.ThisType);
-  IO.mapRequired("CallConv", Record.CallConv);
-  IO.mapRequired("Options", Record.Options);
-  IO.mapRequired("ParameterCount", Record.ParameterCount);
-  IO.mapRequired("ArgumentList", Record.ArgumentList);
-  IO.mapRequired("ThisPointerAdjustment", Record.ThisPointerAdjustment);
-}
-
-template <> void LeafRecordImpl<LabelRecord>::map(IO &IO) {
-  IO.mapRequired("Mode", Record.Mode);
-}
-
-template <> void LeafRecordImpl<MemberFuncIdRecord>::map(IO &IO) {
-  IO.mapRequired("ClassType", Record.ClassType);
-  IO.mapRequired("FunctionType", Record.FunctionType);
-  IO.mapRequired("Name", Record.Name);
-}
-
-template <> void LeafRecordImpl<ArgListRecord>::map(IO &IO) {
-  IO.mapRequired("ArgIndices", Record.ArgIndices);
-}
-
-template <> void LeafRecordImpl<StringListRecord>::map(IO &IO) {
-  IO.mapRequired("StringIndices", Record.StringIndices);
-}
-
-template <> void LeafRecordImpl<PointerRecord>::map(IO &IO) {
-  IO.mapRequired("ReferentType", Record.ReferentType);
-  IO.mapRequired("Attrs", Record.Attrs);
-  IO.mapOptional("MemberInfo", Record.MemberInfo);
-}
-
-template <> void LeafRecordImpl<ArrayRecord>::map(IO &IO) {
-  IO.mapRequired("ElementType", Record.ElementType);
-  IO.mapRequired("IndexType", Record.IndexType);
-  IO.mapRequired("Size", Record.Size);
-  IO.mapRequired("Name", Record.Name);
-}
-
-void LeafRecordImpl<FieldListRecord>::map(IO &IO) {
-  IO.mapRequired("FieldList", Members);
-}
-}
-}
-}
-
-namespace {
-class MemberRecordConversionVisitor : public TypeVisitorCallbacks {
-public:
-  explicit MemberRecordConversionVisitor(std::vector<MemberRecord> &Records)
-      : Records(Records) {}
-
-#define TYPE_RECORD(EnumName, EnumVal, Name)
-#define MEMBER_RECORD(EnumName, EnumVal, Name)                                 \
-  Error visitKnownMember(CVMemberRecord &CVR, Name##Record &Record) override { \
-    return visitKnownMemberImpl(Record);                                       \
-  }
-#define TYPE_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)
-#define MEMBER_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)
-#include "llvm/DebugInfo/CodeView/CodeViewTypes.def"
-private:
-  template <typename T> Error visitKnownMemberImpl(T &Record) {
-    TypeLeafKind K = static_cast<TypeLeafKind>(Record.getKind());
-    auto Impl = std::make_shared<MemberRecordImpl<T>>(K);
-    Impl->Record = Record;
-    Records.push_back(MemberRecord{Impl});
-    return Error::success();
-  }
-
-  std::vector<MemberRecord> &Records;
-};
-}
-
-Error LeafRecordImpl<FieldListRecord>::fromCodeViewRecord(CVType Type) {
-  MemberRecordConversionVisitor V(Members);
-  return visitMemberRecordStream(Type.content(), V);
-}
-
-CVType LeafRecordImpl<FieldListRecord>::toCodeViewRecord(
-    BumpPtrAllocator &Allocator) const {
-  TypeTableBuilder TTB(Allocator);
-  FieldListRecordBuilder FLRB(TTB);
-  FLRB.begin();
-  for (const auto &Member : Members) {
-    Member.Member->writeTo(FLRB);
-  }
-  FLRB.end(true);
-  return CVType(Kind, TTB.records().front());
-}
-
-void MappingTraits<OneMethodRecord>::mapping(IO &io, OneMethodRecord &Record) {
-  io.mapRequired("Type", Record.Type);
-  io.mapRequired("Attrs", Record.Attrs.Attrs);
-  io.mapRequired("VFTableOffset", Record.VFTableOffset);
-  io.mapRequired("Name", Record.Name);
-}
-
-namespace llvm {
-namespace CodeViewYAML {
-namespace detail {
-template <> void LeafRecordImpl<ClassRecord>::map(IO &IO) {
-  IO.mapRequired("MemberCount", Record.MemberCount);
-  IO.mapRequired("Options", Record.Options);
-  IO.mapRequired("FieldList", Record.FieldList);
-  IO.mapRequired("Name", Record.Name);
-  IO.mapRequired("UniqueName", Record.UniqueName);
-
-  IO.mapRequired("DerivationList", Record.DerivationList);
-  IO.mapRequired("VTableShape", Record.VTableShape);
-  IO.mapRequired("Size", Record.Size);
-}
-
-template <> void LeafRecordImpl<UnionRecord>::map(IO &IO) {
-  IO.mapRequired("MemberCount", Record.MemberCount);
-  IO.mapRequired("Options", Record.Options);
-  IO.mapRequired("FieldList", Record.FieldList);
-  IO.mapRequired("Name", Record.Name);
-  IO.mapRequired("UniqueName", Record.UniqueName);
-
-  IO.mapRequired("Size", Record.Size);
-}
-
-template <> void LeafRecordImpl<EnumRecord>::map(IO &IO) {
-  IO.mapRequired("NumEnumerators", Record.MemberCount);
-  IO.mapRequired("Options", Record.Options);
-  IO.mapRequired("FieldList", Record.FieldList);
-  IO.mapRequired("Name", Record.Name);
-  IO.mapRequired("UniqueName", Record.UniqueName);
-
-  IO.mapRequired("UnderlyingType", Record.UnderlyingType);
-}
-
-template <> void LeafRecordImpl<BitFieldRecord>::map(IO &IO) {
-  IO.mapRequired("Type", Record.Type);
-  IO.mapRequired("BitSize", Record.BitSize);
-  IO.mapRequired("BitOffset", Record.BitOffset);
-}
-
-template <> void LeafRecordImpl<VFTableShapeRecord>::map(IO &IO) {
-  IO.mapRequired("Slots", Record.Slots);
-}
-
-template <> void LeafRecordImpl<TypeServer2Record>::map(IO &IO) {
-  IO.mapRequired("Guid", Record.Guid);
-  IO.mapRequired("Age", Record.Age);
-  IO.mapRequired("Name", Record.Name);
-}
-
-template <> void LeafRecordImpl<StringIdRecord>::map(IO &IO) {
-  IO.mapRequired("Id", Record.Id);
-  IO.mapRequired("String", Record.String);
-}
-
-template <> void LeafRecordImpl<FuncIdRecord>::map(IO &IO) {
-  IO.mapRequired("ParentScope", Record.ParentScope);
-  IO.mapRequired("FunctionType", Record.FunctionType);
-  IO.mapRequired("Name", Record.Name);
-}
-
-template <> void LeafRecordImpl<UdtSourceLineRecord>::map(IO &IO) {
-  IO.mapRequired("UDT", Record.UDT);
-  IO.mapRequired("SourceFile", Record.SourceFile);
-  IO.mapRequired("LineNumber", Record.LineNumber);
-}
-
-template <> void LeafRecordImpl<UdtModSourceLineRecord>::map(IO &IO) {
-  IO.mapRequired("UDT", Record.UDT);
-  IO.mapRequired("SourceFile", Record.SourceFile);
-  IO.mapRequired("LineNumber", Record.LineNumber);
-  IO.mapRequired("Module", Record.Module);
-}
-
-template <> void LeafRecordImpl<BuildInfoRecord>::map(IO &IO) {
-  IO.mapRequired("ArgIndices", Record.ArgIndices);
-}
-
-template <> void LeafRecordImpl<VFTableRecord>::map(IO &IO) {
-  IO.mapRequired("CompleteClass", Record.CompleteClass);
-  IO.mapRequired("OverriddenVFTable", Record.OverriddenVFTable);
-  IO.mapRequired("VFPtrOffset", Record.VFPtrOffset);
-  IO.mapRequired("MethodNames", Record.MethodNames);
-}
-
-template <> void LeafRecordImpl<MethodOverloadListRecord>::map(IO &IO) {
-  IO.mapRequired("Methods", Record.Methods);
-}
-
-template <> void MemberRecordImpl<OneMethodRecord>::map(IO &IO) {
-  MappingTraits<OneMethodRecord>::mapping(IO, Record);
-}
-
-template <> void MemberRecordImpl<OverloadedMethodRecord>::map(IO &IO) {
-  IO.mapRequired("NumOverloads", Record.NumOverloads);
-  IO.mapRequired("MethodList", Record.MethodList);
-  IO.mapRequired("Name", Record.Name);
-}
-
-template <> void MemberRecordImpl<NestedTypeRecord>::map(IO &IO) {
-  IO.mapRequired("Type", Record.Type);
-  IO.mapRequired("Name", Record.Name);
-}
-
-template <> void MemberRecordImpl<DataMemberRecord>::map(IO &IO) {
-  IO.mapRequired("Attrs", Record.Attrs.Attrs);
-  IO.mapRequired("Type", Record.Type);
-  IO.mapRequired("FieldOffset", Record.FieldOffset);
-  IO.mapRequired("Name", Record.Name);
-}
-
-template <> void MemberRecordImpl<StaticDataMemberRecord>::map(IO &IO) {
-  IO.mapRequired("Attrs", Record.Attrs.Attrs);
-  IO.mapRequired("Type", Record.Type);
-  IO.mapRequired("Name", Record.Name);
-}
-
-template <> void MemberRecordImpl<EnumeratorRecord>::map(IO &IO) {
-  IO.mapRequired("Attrs", Record.Attrs.Attrs);
-  IO.mapRequired("Value", Record.Value);
-  IO.mapRequired("Name", Record.Name);
-}
-
-template <> void MemberRecordImpl<VFPtrRecord>::map(IO &IO) {
-  IO.mapRequired("Type", Record.Type);
-}
-
-template <> void MemberRecordImpl<BaseClassRecord>::map(IO &IO) {
-  IO.mapRequired("Attrs", Record.Attrs.Attrs);
-  IO.mapRequired("Type", Record.Type);
-  IO.mapRequired("Offset", Record.Offset);
-}
-
-template <> void MemberRecordImpl<VirtualBaseClassRecord>::map(IO &IO) {
-  IO.mapRequired("Attrs", Record.Attrs.Attrs);
-  IO.mapRequired("BaseType", Record.BaseType);
-  IO.mapRequired("VBPtrType", Record.VBPtrType);
-  IO.mapRequired("VBPtrOffset", Record.VBPtrOffset);
-  IO.mapRequired("VTableIndex", Record.VTableIndex);
-}
-
-template <> void MemberRecordImpl<ListContinuationRecord>::map(IO &IO) {
-  IO.mapRequired("ContinuationIndex", Record.ContinuationIndex);
-}
-}
-}
-}
-
-template <typename T>
-static inline Expected<LeafRecord> fromCodeViewRecordImpl(CVType Type) {
-  LeafRecord Result;
-
-  auto Impl = std::make_shared<LeafRecordImpl<T>>(Type.kind());
-  if (auto EC = Impl->fromCodeViewRecord(Type))
-    return std::move(EC);
-  Result.Leaf = Impl;
-  return Result;
-}
-
-Expected<LeafRecord> LeafRecord::fromCodeViewRecord(CVType Type) {
-#define TYPE_RECORD(EnumName, EnumVal, ClassName)                              \
-  case EnumName:                                                               \
-    return fromCodeViewRecordImpl<ClassName##Record>(Type);
-#define TYPE_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)             \
-  TYPE_RECORD(EnumName, EnumVal, ClassName)
-#define MEMBER_RECORD(EnumName, EnumVal, ClassName)
-#define MEMBER_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)
-  switch (Type.kind()) {
-#include "llvm/DebugInfo/CodeView/CodeViewTypes.def"
-  default: { llvm_unreachable("Unknown leaf kind!"); }
-  }
-  return make_error<CodeViewError>(cv_error_code::corrupt_record);
-}
-
-CVType LeafRecord::toCodeViewRecord(BumpPtrAllocator &Allocator) const {
-  return Leaf->toCodeViewRecord(Allocator);
-}
-
-namespace llvm {
-namespace yaml {
-template <> struct MappingTraits<LeafRecordBase> {
-  static void mapping(IO &io, LeafRecordBase &Record) { Record.map(io); }
-};
-
-template <> struct MappingTraits<MemberRecordBase> {
-  static void mapping(IO &io, MemberRecordBase &Record) { Record.map(io); }
-};
-}
-}
-
-template <typename ConcreteType>
-static void mapLeafRecordImpl(IO &IO, const char *Class, TypeLeafKind Kind,
-                              LeafRecord &Obj) {
-  if (!IO.outputting())
-    Obj.Leaf = std::make_shared<LeafRecordImpl<ConcreteType>>(Kind);
-
-  if (Kind == LF_FIELDLIST)
-    Obj.Leaf->map(IO);
-  else
-    IO.mapRequired(Class, *Obj.Leaf);
-}
-
-void MappingTraits<LeafRecord>::mapping(IO &IO, LeafRecord &Obj) {
-  TypeLeafKind Kind;
-  if (IO.outputting())
-    Kind = Obj.Leaf->Kind;
-  IO.mapRequired("Kind", Kind);
-
-#define TYPE_RECORD(EnumName, EnumVal, ClassName)                              \
-  case EnumName:                                                               \
-    mapLeafRecordImpl<ClassName##Record>(IO, #ClassName, Kind, Obj);           \
-    break;
-#define TYPE_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)             \
-  TYPE_RECORD(EnumName, EnumVal, ClassName)
-#define MEMBER_RECORD(EnumName, EnumVal, ClassName)
-#define MEMBER_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)
-  switch (Kind) {
-#include "llvm/DebugInfo/CodeView/CodeViewTypes.def"
-  default: { llvm_unreachable("Unknown leaf kind!"); }
-  }
-}
-
-template <typename ConcreteType>
-static void mapMemberRecordImpl(IO &IO, const char *Class, TypeLeafKind Kind,
-                                MemberRecord &Obj) {
-  if (!IO.outputting())
-    Obj.Member = std::make_shared<MemberRecordImpl<ConcreteType>>(Kind);
-
-  IO.mapRequired(Class, *Obj.Member);
-}
-
-void MappingTraits<MemberRecord>::mapping(IO &IO, MemberRecord &Obj) {
-  TypeLeafKind Kind;
-  if (IO.outputting())
-    Kind = Obj.Member->Kind;
-  IO.mapRequired("Kind", Kind);
-
-#define MEMBER_RECORD(EnumName, EnumVal, ClassName)                            \
-  case EnumName:                                                               \
-    mapMemberRecordImpl<ClassName##Record>(IO, #ClassName, Kind, Obj);         \
-    break;
-#define MEMBER_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)           \
-  MEMBER_RECORD(EnumName, EnumVal, ClassName)
-#define TYPE_RECORD(EnumName, EnumVal, ClassName)
-#define TYPE_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)
-  switch (Kind) {
-#include "llvm/DebugInfo/CodeView/CodeViewTypes.def"
-  default: { llvm_unreachable("Unknown member kind!"); }
-  }
-}
-
-namespace llvm {
-namespace CodeViewYAML {
-namespace detail {
-template <> void SymbolRecordImpl<ScopeEndSym>::map(IO &IO) {}
-
-template <> void SymbolRecordImpl<Thunk32Sym>::map(IO &IO) {
-  IO.mapRequired("Parent", Symbol.Parent);
-  IO.mapRequired("End", Symbol.End);
-  IO.mapRequired("Next", Symbol.Next);
-  IO.mapRequired("Off", Symbol.Offset);
-  IO.mapRequired("Seg", Symbol.Segment);
-  IO.mapRequired("Len", Symbol.Length);
-  IO.mapRequired("Ordinal", Symbol.Thunk);
-}
-
-template <> void SymbolRecordImpl<TrampolineSym>::map(IO &IO) {
-  IO.mapRequired("Type", Symbol.Type);
-  IO.mapRequired("Size", Symbol.Size);
-  IO.mapRequired("ThunkOff", Symbol.ThunkOffset);
-  IO.mapRequired("TargetOff", Symbol.TargetOffset);
-  IO.mapRequired("ThunkSection", Symbol.ThunkSection);
-  IO.mapRequired("TargetSection", Symbol.TargetSection);
-}
-
-template <> void SymbolRecordImpl<SectionSym>::map(IO &IO) {
-  IO.mapRequired("SectionNumber", Symbol.SectionNumber);
-  IO.mapRequired("Alignment", Symbol.Alignment);
-  IO.mapRequired("Rva", Symbol.Rva);
-  IO.mapRequired("Length", Symbol.Length);
-  IO.mapRequired("Characteristics", Symbol.Characteristics);
-  IO.mapRequired("Name", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<CoffGroupSym>::map(IO &IO) {
-  IO.mapRequired("Size", Symbol.Size);
-  IO.mapRequired("Characteristics", Symbol.Characteristics);
-  IO.mapRequired("Offset", Symbol.Offset);
-  IO.mapRequired("Segment", Symbol.Segment);
-  IO.mapRequired("Name", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<ExportSym>::map(IO &IO) {
-  IO.mapRequired("Ordinal", Symbol.Ordinal);
-  IO.mapRequired("Flags", Symbol.Flags);
-  IO.mapRequired("Name", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<ProcSym>::map(IO &IO) {
-  // TODO: Print the linkage name
-
-  IO.mapRequired("PtrParent", Symbol.Parent);
-  IO.mapRequired("PtrEnd", Symbol.End);
-  IO.mapRequired("PtrNext", Symbol.Next);
-  IO.mapRequired("CodeSize", Symbol.CodeSize);
-  IO.mapRequired("DbgStart", Symbol.DbgStart);
-  IO.mapRequired("DbgEnd", Symbol.DbgEnd);
-  IO.mapRequired("FunctionType", Symbol.FunctionType);
-  IO.mapRequired("Segment", Symbol.Segment);
-  IO.mapRequired("Flags", Symbol.Flags);
-  IO.mapRequired("DisplayName", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<RegisterSym>::map(IO &IO) {
-  IO.mapRequired("Type", Symbol.Index);
-  IO.mapRequired("Seg", Symbol.Register);
-  IO.mapRequired("Name", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<PublicSym32>::map(IO &IO) {
-  IO.mapRequired("Type", Symbol.Index);
-  IO.mapRequired("Seg", Symbol.Segment);
-  IO.mapRequired("Off", Symbol.Offset);
-  IO.mapRequired("Name", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<ProcRefSym>::map(IO &IO) {
-  IO.mapRequired("SumName", Symbol.SumName);
-  IO.mapRequired("SymOffset", Symbol.SymOffset);
-  IO.mapRequired("Mod", Symbol.Module);
-  IO.mapRequired("Name", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<EnvBlockSym>::map(IO &IO) {
-  IO.mapRequired("Entries", Symbol.Fields);
-}
-
-template <> void SymbolRecordImpl<InlineSiteSym>::map(IO &IO) {
-  IO.mapRequired("PtrParent", Symbol.Parent);
-  IO.mapRequired("PtrEnd", Symbol.End);
-  IO.mapRequired("Inlinee", Symbol.Inlinee);
-  // TODO: The binary annotations
-}
-
-template <> void SymbolRecordImpl<LocalSym>::map(IO &IO) {
-  IO.mapRequired("Type", Symbol.Type);
-  IO.mapRequired("Flags", Symbol.Flags);
-  IO.mapRequired("VarName", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<DefRangeSym>::map(IO &IO) {
-  // TODO: Print the subfields
-}
-
-template <> void SymbolRecordImpl<DefRangeSubfieldSym>::map(IO &IO) {
-  // TODO: Print the subfields
-}
-
-template <> void SymbolRecordImpl<DefRangeRegisterSym>::map(IO &IO) {
-  // TODO: Print the subfields
-}
-
-template <> void SymbolRecordImpl<DefRangeFramePointerRelSym>::map(IO &IO) {
-  // TODO: Print the subfields
-}
-
-template <> void SymbolRecordImpl<DefRangeSubfieldRegisterSym>::map(IO &IO) {
-  // TODO: Print the subfields
-}
-
-template <>
-void SymbolRecordImpl<DefRangeFramePointerRelFullScopeSym>::map(IO &IO) {
-  // TODO: Print the subfields
-}
-
-template <> void SymbolRecordImpl<DefRangeRegisterRelSym>::map(IO &IO) {
-  // TODO: Print the subfields
-}
-
-template <> void SymbolRecordImpl<BlockSym>::map(IO &IO) {
-  // TODO: Print the linkage name
-  IO.mapRequired("PtrParent", Symbol.Parent);
-  IO.mapRequired("PtrEnd", Symbol.End);
-  IO.mapRequired("CodeSize", Symbol.CodeSize);
-  IO.mapRequired("Segment", Symbol.Segment);
-  IO.mapRequired("BlockName", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<LabelSym>::map(IO &IO) {
-  // TODO: Print the linkage name
-  IO.mapRequired("Segment", Symbol.Segment);
-  IO.mapRequired("Flags", Symbol.Flags);
-  IO.mapRequired("Flags", Symbol.Flags);
-  IO.mapRequired("DisplayName", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<ObjNameSym>::map(IO &IO) {
-  IO.mapRequired("Signature", Symbol.Signature);
-  IO.mapRequired("ObjectName", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<Compile2Sym>::map(IO &IO) {
-  IO.mapRequired("Flags", Symbol.Flags);
-  IO.mapRequired("Machine", Symbol.Machine);
-  IO.mapRequired("FrontendMajor", Symbol.VersionFrontendMajor);
-  IO.mapRequired("FrontendMinor", Symbol.VersionFrontendMinor);
-  IO.mapRequired("FrontendBuild", Symbol.VersionFrontendBuild);
-  IO.mapRequired("BackendMajor", Symbol.VersionBackendMajor);
-  IO.mapRequired("BackendMinor", Symbol.VersionBackendMinor);
-  IO.mapRequired("BackendBuild", Symbol.VersionBackendBuild);
-  IO.mapRequired("Version", Symbol.Version);
-}
-
-template <> void SymbolRecordImpl<Compile3Sym>::map(IO &IO) {
-  IO.mapRequired("Flags", Symbol.Flags);
-  IO.mapRequired("Machine", Symbol.Machine);
-  IO.mapRequired("FrontendMajor", Symbol.VersionFrontendMajor);
-  IO.mapRequired("FrontendMinor", Symbol.VersionFrontendMinor);
-  IO.mapRequired("FrontendBuild", Symbol.VersionFrontendBuild);
-  IO.mapRequired("FrontendQFE", Symbol.VersionFrontendQFE);
-  IO.mapRequired("BackendMajor", Symbol.VersionBackendMajor);
-  IO.mapRequired("BackendMinor", Symbol.VersionBackendMinor);
-  IO.mapRequired("BackendBuild", Symbol.VersionBackendBuild);
-  IO.mapRequired("BackendQFE", Symbol.VersionBackendQFE);
-  IO.mapRequired("Version", Symbol.Version);
-}
-
-template <> void SymbolRecordImpl<FrameProcSym>::map(IO &IO) {
-  IO.mapRequired("TotalFrameBytes", Symbol.TotalFrameBytes);
-  IO.mapRequired("PaddingFrameBytes", Symbol.PaddingFrameBytes);
-  IO.mapRequired("OffsetToPadding", Symbol.OffsetToPadding);
-  IO.mapRequired("BytesOfCalleeSavedRegisters",
-                 Symbol.BytesOfCalleeSavedRegisters);
-  IO.mapRequired("OffsetOfExceptionHandler", Symbol.OffsetOfExceptionHandler);
-  IO.mapRequired("SectionIdOfExceptionHandler",
-                 Symbol.SectionIdOfExceptionHandler);
-  IO.mapRequired("Flags", Symbol.Flags);
-}
-
-template <> void SymbolRecordImpl<CallSiteInfoSym>::map(IO &IO) {
-  // TODO: Map Linkage Name
-  IO.mapRequired("Segment", Symbol.Segment);
-  IO.mapRequired("Type", Symbol.Type);
-}
-
-template <> void SymbolRecordImpl<FileStaticSym>::map(IO &IO) {
-  IO.mapRequired("Index", Symbol.Index);
-  IO.mapRequired("ModFilenameOffset", Symbol.ModFilenameOffset);
-  IO.mapRequired("Flags", Symbol.Flags);
-  IO.mapRequired("Name", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<HeapAllocationSiteSym>::map(IO &IO) {
-  // TODO: Map Linkage Name
-  IO.mapRequired("Segment", Symbol.Segment);
-  IO.mapRequired("CallInstructionSize", Symbol.CallInstructionSize);
-  IO.mapRequired("Type", Symbol.Type);
-}
-
-template <> void SymbolRecordImpl<FrameCookieSym>::map(IO &IO) {
-  // TODO: Map Linkage Name
-  IO.mapRequired("Register", Symbol.Register);
-  IO.mapRequired("CookieKind", Symbol.CookieKind);
-  IO.mapRequired("Flags", Symbol.Flags);
-}
-
-template <> void SymbolRecordImpl<CallerSym>::map(IO &IO) {
-  IO.mapRequired("FuncID", Symbol.Indices);
-}
-
-template <> void SymbolRecordImpl<UDTSym>::map(IO &IO) {
-  IO.mapRequired("Type", Symbol.Type);
-  IO.mapRequired("UDTName", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<BuildInfoSym>::map(IO &IO) {
-  IO.mapRequired("BuildId", Symbol.BuildId);
-}
-
-template <> void SymbolRecordImpl<BPRelativeSym>::map(IO &IO) {
-  IO.mapRequired("Offset", Symbol.Offset);
-  IO.mapRequired("Type", Symbol.Type);
-  IO.mapRequired("VarName", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<RegRelativeSym>::map(IO &IO) {
-  IO.mapRequired("Offset", Symbol.Offset);
-  IO.mapRequired("Type", Symbol.Type);
-  IO.mapRequired("Register", Symbol.Register);
-  IO.mapRequired("VarName", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<ConstantSym>::map(IO &IO) {
-  IO.mapRequired("Type", Symbol.Type);
-  IO.mapRequired("Value", Symbol.Value);
-  IO.mapRequired("Name", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<DataSym>::map(IO &IO) {
-  // TODO: Map linkage name
-  IO.mapRequired("Type", Symbol.Type);
-  IO.mapRequired("DisplayName", Symbol.Name);
-}
-
-template <> void SymbolRecordImpl<ThreadLocalDataSym>::map(IO &IO) {
-  // TODO: Map linkage name
-  IO.mapRequired("Type", Symbol.Type);
-  IO.mapRequired("DisplayName", Symbol.Name);
-}
-}
-}
-}
-
-CVSymbol CodeViewYAML::SymbolRecord::toCodeViewSymbol(
-    BumpPtrAllocator &Allocator) const {
-  return Symbol->toCodeViewSymbol(Allocator);
-}
-
-namespace llvm {
-namespace yaml {
-template <> struct MappingTraits<SymbolRecordBase> {
-  static void mapping(IO &io, SymbolRecordBase &Record) { Record.map(io); }
-};
-}
-}
-
-template <typename SymbolType>
-static inline Expected<CodeViewYAML::SymbolRecord>
-fromCodeViewSymbolImpl(CVSymbol Symbol) {
-  CodeViewYAML::SymbolRecord Result;
-
-  auto Impl = std::make_shared<SymbolRecordImpl<SymbolType>>(Symbol.kind());
-  if (auto EC = Impl->fromCodeViewSymbol(Symbol))
-    return std::move(EC);
-  Result.Symbol = Impl;
-  return Result;
-}
-
-Expected<CodeViewYAML::SymbolRecord>
-CodeViewYAML::SymbolRecord::fromCodeViewSymbol(CVSymbol Symbol) {
-#define SYMBOL_RECORD(EnumName, EnumVal, ClassName)                            \
-  case EnumName:                                                               \
-    return fromCodeViewSymbolImpl<ClassName>(Symbol);
-#define SYMBOL_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)           \
-  SYMBOL_RECORD(EnumName, EnumVal, ClassName)
-  switch (Symbol.kind()) {
-#include "llvm/DebugInfo/CodeView/CodeViewSymbols.def"
-  default: { llvm_unreachable("Unknown symbol kind!"); }
-  }
-  return make_error<CodeViewError>(cv_error_code::corrupt_record);
-}
-
-template <typename ConcreteType>
-static void mapSymbolRecordImpl(IO &IO, const char *Class, SymbolKind Kind,
-                                CodeViewYAML::SymbolRecord &Obj) {
-  if (!IO.outputting())
-    Obj.Symbol = std::make_shared<SymbolRecordImpl<ConcreteType>>(Kind);
-
-  IO.mapRequired(Class, *Obj.Symbol);
-}
-
-void MappingTraits<CodeViewYAML::SymbolRecord>::mapping(
-    IO &IO, CodeViewYAML::SymbolRecord &Obj) {
-  SymbolKind Kind;
-  if (IO.outputting())
-    Kind = Obj.Symbol->Kind;
-  IO.mapRequired("Kind", Kind);
-
-#define SYMBOL_RECORD(EnumName, EnumVal, ClassName)                            \
-  case EnumName:                                                               \
-    mapSymbolRecordImpl<ClassName>(IO, #ClassName, Kind, Obj);                 \
-    break;
-#define SYMBOL_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)           \
-  SYMBOL_RECORD(EnumName, EnumVal, ClassName)
-  switch (Kind) {
-#include "llvm/DebugInfo/CodeView/CodeViewSymbols.def"
-  default: { llvm_unreachable("Unknown symbol kind!"); }
-  }
-}

Added: llvm/trunk/lib/ObjectYAML/CodeViewYAMLDebugSections.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/CodeViewYAMLDebugSections.cpp?rev=304278&view=auto
==============================================================================
--- llvm/trunk/lib/ObjectYAML/CodeViewYAMLDebugSections.cpp (added)
+++ llvm/trunk/lib/ObjectYAML/CodeViewYAMLDebugSections.cpp Tue May 30 23:17:13 2017
@@ -0,0 +1,127 @@
+//===- CodeViewYAMLDebugSections.cpp - CodeView YAMLIO debug sections -----===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines classes for handling the YAML representation of CodeView
+// Debug Info.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/ObjectYAML/CodeViewYAMLDebugSections.h"
+
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/StringSwitch.h"
+#include "llvm/DebugInfo/CodeView/CodeViewError.h"
+#include "llvm/DebugInfo/CodeView/EnumTables.h"
+#include "llvm/DebugInfo/CodeView/SymbolRecord.h"
+
+using namespace llvm;
+using namespace llvm::codeview;
+using namespace llvm::CodeViewYAML;
+using namespace llvm::CodeViewYAML::detail;
+using namespace llvm::yaml;
+
+LLVM_YAML_IS_SEQUENCE_VECTOR(SourceFileChecksumEntry)
+LLVM_YAML_IS_SEQUENCE_VECTOR(SourceLineEntry)
+LLVM_YAML_IS_SEQUENCE_VECTOR(SourceColumnEntry)
+LLVM_YAML_IS_SEQUENCE_VECTOR(SourceLineBlock)
+LLVM_YAML_IS_SEQUENCE_VECTOR(SourceLineInfo)
+LLVM_YAML_IS_SEQUENCE_VECTOR(InlineeSite)
+LLVM_YAML_IS_SEQUENCE_VECTOR(InlineeInfo)
+LLVM_YAML_IS_SEQUENCE_VECTOR(StringRef)
+
+LLVM_YAML_DECLARE_SCALAR_TRAITS(HexFormattedString, false)
+LLVM_YAML_DECLARE_ENUM_TRAITS(FileChecksumKind)
+LLVM_YAML_DECLARE_BITSET_TRAITS(LineFlags)
+
+LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SourceLineEntry)
+LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SourceColumnEntry)
+LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SourceFileChecksumEntry)
+LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SourceLineInfo)
+LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::SourceLineBlock)
+LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::InlineeInfo)
+LLVM_YAML_DECLARE_MAPPING_TRAITS(CodeViewYAML::InlineeSite)
+
+void ScalarBitSetTraits<LineFlags>::bitset(IO &io, LineFlags &Flags) {
+  io.bitSetCase(Flags, "HasColumnInfo", LF_HaveColumns);
+  io.enumFallback<Hex16>(Flags);
+}
+
+void ScalarEnumerationTraits<FileChecksumKind>::enumeration(
+    IO &io, FileChecksumKind &Kind) {
+  io.enumCase(Kind, "None", FileChecksumKind::None);
+  io.enumCase(Kind, "MD5", FileChecksumKind::MD5);
+  io.enumCase(Kind, "SHA1", FileChecksumKind::SHA1);
+  io.enumCase(Kind, "SHA256", FileChecksumKind::SHA256);
+}
+
+void ScalarTraits<HexFormattedString>::output(const HexFormattedString &Value,
+                                              void *ctx, raw_ostream &Out) {
+  StringRef Bytes(reinterpret_cast<const char *>(Value.Bytes.data()),
+                  Value.Bytes.size());
+  Out << toHex(Bytes);
+}
+
+StringRef ScalarTraits<HexFormattedString>::input(StringRef Scalar, void *ctxt,
+                                                  HexFormattedString &Value) {
+  std::string H = fromHex(Scalar);
+  Value.Bytes.assign(H.begin(), H.end());
+  return StringRef();
+}
+
+void MappingTraits<SourceLineEntry>::mapping(IO &IO, SourceLineEntry &Obj) {
+  IO.mapRequired("Offset", Obj.Offset);
+  IO.mapRequired("LineStart", Obj.LineStart);
+  IO.mapRequired("IsStatement", Obj.IsStatement);
+  IO.mapRequired("EndDelta", Obj.EndDelta);
+}
+
+void MappingTraits<SourceColumnEntry>::mapping(IO &IO, SourceColumnEntry &Obj) {
+  IO.mapRequired("StartColumn", Obj.StartColumn);
+  IO.mapRequired("EndColumn", Obj.EndColumn);
+}
+
+void MappingTraits<SourceLineBlock>::mapping(IO &IO, SourceLineBlock &Obj) {
+  IO.mapRequired("FileName", Obj.FileName);
+  IO.mapRequired("Lines", Obj.Lines);
+  IO.mapRequired("Columns", Obj.Columns);
+}
+
+void MappingTraits<SourceFileChecksumEntry>::mapping(
+    IO &IO, SourceFileChecksumEntry &Obj) {
+  IO.mapRequired("FileName", Obj.FileName);
+  IO.mapRequired("Kind", Obj.Kind);
+  IO.mapRequired("Checksum", Obj.ChecksumBytes);
+}
+
+void MappingTraits<SourceLineInfo>::mapping(IO &IO, SourceLineInfo &Obj) {
+  IO.mapRequired("CodeSize", Obj.CodeSize);
+
+  IO.mapRequired("Flags", Obj.Flags);
+  IO.mapRequired("RelocOffset", Obj.RelocOffset);
+  IO.mapRequired("RelocSegment", Obj.RelocSegment);
+  IO.mapRequired("Blocks", Obj.Blocks);
+}
+
+void MappingTraits<SourceFileInfo>::mapping(IO &IO, SourceFileInfo &Obj) {
+  IO.mapOptional("Checksums", Obj.FileChecksums);
+  IO.mapOptional("Lines", Obj.LineFragments);
+  IO.mapOptional("InlineeLines", Obj.Inlinees);
+}
+
+void MappingTraits<InlineeSite>::mapping(IO &IO, InlineeSite &Obj) {
+  IO.mapRequired("FileName", Obj.FileName);
+  IO.mapRequired("LineNum", Obj.SourceLineNum);
+  IO.mapRequired("Inlinee", Obj.Inlinee);
+  IO.mapOptional("ExtraFiles", Obj.ExtraFiles);
+}
+
+void MappingTraits<InlineeInfo>::mapping(IO &IO, InlineeInfo &Obj) {
+  IO.mapRequired("HasExtraFiles", Obj.HasExtraFiles);
+  IO.mapRequired("Sites", Obj.Sites);
+}

Added: llvm/trunk/lib/ObjectYAML/CodeViewYAMLSymbols.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/CodeViewYAMLSymbols.cpp?rev=304278&view=auto
==============================================================================
--- llvm/trunk/lib/ObjectYAML/CodeViewYAMLSymbols.cpp (added)
+++ llvm/trunk/lib/ObjectYAML/CodeViewYAMLSymbols.cpp Tue May 30 23:17:13 2017
@@ -0,0 +1,496 @@
+//===- CodeViewYAMLSymbols.cpp - CodeView YAMLIO Symbol implementation ----===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines classes for handling the YAML representation of CodeView
+// Debug Info.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/ObjectYAML/CodeViewYAMLSymbols.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/StringSwitch.h"
+#include "llvm/DebugInfo/CodeView/CVTypeVisitor.h"
+#include "llvm/DebugInfo/CodeView/CodeViewError.h"
+#include "llvm/DebugInfo/CodeView/EnumTables.h"
+#include "llvm/DebugInfo/CodeView/SymbolDeserializer.h"
+#include "llvm/DebugInfo/CodeView/SymbolSerializer.h"
+
+using namespace llvm;
+using namespace llvm::codeview;
+using namespace llvm::CodeViewYAML;
+using namespace llvm::CodeViewYAML::detail;
+using namespace llvm::yaml;
+
+LLVM_YAML_IS_SEQUENCE_VECTOR(StringRef)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(TypeIndex)
+
+// We only need to declare these, the definitions are in CodeViewYAMLTypes.cpp
+LLVM_YAML_DECLARE_SCALAR_TRAITS(APSInt, false)
+LLVM_YAML_DECLARE_SCALAR_TRAITS(TypeIndex, false)
+
+LLVM_YAML_DECLARE_ENUM_TRAITS(SymbolKind)
+
+LLVM_YAML_DECLARE_BITSET_TRAITS(CompileSym2Flags)
+LLVM_YAML_DECLARE_BITSET_TRAITS(CompileSym3Flags)
+LLVM_YAML_DECLARE_BITSET_TRAITS(ExportFlags)
+LLVM_YAML_DECLARE_BITSET_TRAITS(LocalSymFlags)
+LLVM_YAML_DECLARE_BITSET_TRAITS(ProcSymFlags)
+LLVM_YAML_DECLARE_BITSET_TRAITS(FrameProcedureOptions)
+LLVM_YAML_DECLARE_ENUM_TRAITS(CPUType)
+LLVM_YAML_DECLARE_ENUM_TRAITS(RegisterId)
+LLVM_YAML_DECLARE_ENUM_TRAITS(TrampolineType)
+LLVM_YAML_DECLARE_ENUM_TRAITS(ThunkOrdinal)
+
+void ScalarEnumerationTraits<SymbolKind>::enumeration(IO &io,
+                                                      SymbolKind &Value) {
+  auto SymbolNames = getSymbolTypeNames();
+  for (const auto &E : SymbolNames)
+    io.enumCase(Value, E.Name.str().c_str(), E.Value);
+}
+
+void ScalarBitSetTraits<CompileSym2Flags>::bitset(IO &io,
+                                                  CompileSym2Flags &Flags) {
+  auto FlagNames = getCompileSym2FlagNames();
+  for (const auto &E : FlagNames) {
+    io.bitSetCase(Flags, E.Name.str().c_str(),
+                  static_cast<CompileSym2Flags>(E.Value));
+  }
+}
+
+void ScalarBitSetTraits<CompileSym3Flags>::bitset(IO &io,
+                                                  CompileSym3Flags &Flags) {
+  auto FlagNames = getCompileSym3FlagNames();
+  for (const auto &E : FlagNames) {
+    io.bitSetCase(Flags, E.Name.str().c_str(),
+                  static_cast<CompileSym3Flags>(E.Value));
+  }
+}
+
+void ScalarBitSetTraits<ExportFlags>::bitset(IO &io, ExportFlags &Flags) {
+  auto FlagNames = getExportSymFlagNames();
+  for (const auto &E : FlagNames) {
+    io.bitSetCase(Flags, E.Name.str().c_str(),
+                  static_cast<ExportFlags>(E.Value));
+  }
+}
+
+void ScalarBitSetTraits<LocalSymFlags>::bitset(IO &io, LocalSymFlags &Flags) {
+  auto FlagNames = getLocalFlagNames();
+  for (const auto &E : FlagNames) {
+    io.bitSetCase(Flags, E.Name.str().c_str(),
+                  static_cast<LocalSymFlags>(E.Value));
+  }
+}
+
+void ScalarBitSetTraits<ProcSymFlags>::bitset(IO &io, ProcSymFlags &Flags) {
+  auto FlagNames = getProcSymFlagNames();
+  for (const auto &E : FlagNames) {
+    io.bitSetCase(Flags, E.Name.str().c_str(),
+                  static_cast<ProcSymFlags>(E.Value));
+  }
+}
+
+void ScalarBitSetTraits<FrameProcedureOptions>::bitset(
+    IO &io, FrameProcedureOptions &Flags) {
+  auto FlagNames = getFrameProcSymFlagNames();
+  for (const auto &E : FlagNames) {
+    io.bitSetCase(Flags, E.Name.str().c_str(),
+                  static_cast<FrameProcedureOptions>(E.Value));
+  }
+}
+
+void ScalarEnumerationTraits<CPUType>::enumeration(IO &io, CPUType &Cpu) {
+  auto CpuNames = getCPUTypeNames();
+  for (const auto &E : CpuNames) {
+    io.enumCase(Cpu, E.Name.str().c_str(), static_cast<CPUType>(E.Value));
+  }
+}
+
+void ScalarEnumerationTraits<RegisterId>::enumeration(IO &io, RegisterId &Reg) {
+  auto RegNames = getRegisterNames();
+  for (const auto &E : RegNames) {
+    io.enumCase(Reg, E.Name.str().c_str(), static_cast<RegisterId>(E.Value));
+  }
+  io.enumFallback<Hex16>(Reg);
+}
+
+void ScalarEnumerationTraits<TrampolineType>::enumeration(
+    IO &io, TrampolineType &Tramp) {
+  auto TrampNames = getTrampolineNames();
+  for (const auto &E : TrampNames) {
+    io.enumCase(Tramp, E.Name.str().c_str(),
+                static_cast<TrampolineType>(E.Value));
+  }
+}
+
+void ScalarEnumerationTraits<ThunkOrdinal>::enumeration(IO &io,
+                                                        ThunkOrdinal &Ord) {
+  auto ThunkNames = getThunkOrdinalNames();
+  for (const auto &E : ThunkNames) {
+    io.enumCase(Ord, E.Name.str().c_str(), static_cast<ThunkOrdinal>(E.Value));
+  }
+}
+
+namespace llvm {
+namespace CodeViewYAML {
+namespace detail {
+
+struct SymbolRecordBase {
+  codeview::SymbolKind Kind;
+  explicit SymbolRecordBase(codeview::SymbolKind K) : Kind(K) {}
+
+  virtual ~SymbolRecordBase() {}
+  virtual void map(yaml::IO &io) = 0;
+  virtual codeview::CVSymbol
+  toCodeViewSymbol(BumpPtrAllocator &Allocator) const = 0;
+  virtual Error fromCodeViewSymbol(codeview::CVSymbol Type) = 0;
+};
+
+template <typename T> struct SymbolRecordImpl : public SymbolRecordBase {
+  explicit SymbolRecordImpl(codeview::SymbolKind K)
+      : SymbolRecordBase(K), Symbol(static_cast<SymbolRecordKind>(K)) {}
+
+  void map(yaml::IO &io) override;
+
+  codeview::CVSymbol
+  toCodeViewSymbol(BumpPtrAllocator &Allocator) const override {
+    return SymbolSerializer::writeOneSymbol(Symbol, Allocator);
+  }
+  Error fromCodeViewSymbol(codeview::CVSymbol CVS) override {
+    return SymbolDeserializer::deserializeAs<T>(CVS, Symbol);
+  }
+
+  mutable T Symbol;
+};
+
+template <> void SymbolRecordImpl<ScopeEndSym>::map(IO &IO) {}
+
+template <> void SymbolRecordImpl<Thunk32Sym>::map(IO &IO) {
+  IO.mapRequired("Parent", Symbol.Parent);
+  IO.mapRequired("End", Symbol.End);
+  IO.mapRequired("Next", Symbol.Next);
+  IO.mapRequired("Off", Symbol.Offset);
+  IO.mapRequired("Seg", Symbol.Segment);
+  IO.mapRequired("Len", Symbol.Length);
+  IO.mapRequired("Ordinal", Symbol.Thunk);
+}
+
+template <> void SymbolRecordImpl<TrampolineSym>::map(IO &IO) {
+  IO.mapRequired("Type", Symbol.Type);
+  IO.mapRequired("Size", Symbol.Size);
+  IO.mapRequired("ThunkOff", Symbol.ThunkOffset);
+  IO.mapRequired("TargetOff", Symbol.TargetOffset);
+  IO.mapRequired("ThunkSection", Symbol.ThunkSection);
+  IO.mapRequired("TargetSection", Symbol.TargetSection);
+}
+
+template <> void SymbolRecordImpl<SectionSym>::map(IO &IO) {
+  IO.mapRequired("SectionNumber", Symbol.SectionNumber);
+  IO.mapRequired("Alignment", Symbol.Alignment);
+  IO.mapRequired("Rva", Symbol.Rva);
+  IO.mapRequired("Length", Symbol.Length);
+  IO.mapRequired("Characteristics", Symbol.Characteristics);
+  IO.mapRequired("Name", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<CoffGroupSym>::map(IO &IO) {
+  IO.mapRequired("Size", Symbol.Size);
+  IO.mapRequired("Characteristics", Symbol.Characteristics);
+  IO.mapRequired("Offset", Symbol.Offset);
+  IO.mapRequired("Segment", Symbol.Segment);
+  IO.mapRequired("Name", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<ExportSym>::map(IO &IO) {
+  IO.mapRequired("Ordinal", Symbol.Ordinal);
+  IO.mapRequired("Flags", Symbol.Flags);
+  IO.mapRequired("Name", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<ProcSym>::map(IO &IO) {
+  // TODO: Print the linkage name
+
+  IO.mapRequired("PtrParent", Symbol.Parent);
+  IO.mapRequired("PtrEnd", Symbol.End);
+  IO.mapRequired("PtrNext", Symbol.Next);
+  IO.mapRequired("CodeSize", Symbol.CodeSize);
+  IO.mapRequired("DbgStart", Symbol.DbgStart);
+  IO.mapRequired("DbgEnd", Symbol.DbgEnd);
+  IO.mapRequired("FunctionType", Symbol.FunctionType);
+  IO.mapRequired("Segment", Symbol.Segment);
+  IO.mapRequired("Flags", Symbol.Flags);
+  IO.mapRequired("DisplayName", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<RegisterSym>::map(IO &IO) {
+  IO.mapRequired("Type", Symbol.Index);
+  IO.mapRequired("Seg", Symbol.Register);
+  IO.mapRequired("Name", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<PublicSym32>::map(IO &IO) {
+  IO.mapRequired("Type", Symbol.Index);
+  IO.mapRequired("Seg", Symbol.Segment);
+  IO.mapRequired("Off", Symbol.Offset);
+  IO.mapRequired("Name", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<ProcRefSym>::map(IO &IO) {
+  IO.mapRequired("SumName", Symbol.SumName);
+  IO.mapRequired("SymOffset", Symbol.SymOffset);
+  IO.mapRequired("Mod", Symbol.Module);
+  IO.mapRequired("Name", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<EnvBlockSym>::map(IO &IO) {
+  IO.mapRequired("Entries", Symbol.Fields);
+}
+
+template <> void SymbolRecordImpl<InlineSiteSym>::map(IO &IO) {
+  IO.mapRequired("PtrParent", Symbol.Parent);
+  IO.mapRequired("PtrEnd", Symbol.End);
+  IO.mapRequired("Inlinee", Symbol.Inlinee);
+  // TODO: The binary annotations
+}
+
+template <> void SymbolRecordImpl<LocalSym>::map(IO &IO) {
+  IO.mapRequired("Type", Symbol.Type);
+  IO.mapRequired("Flags", Symbol.Flags);
+  IO.mapRequired("VarName", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<DefRangeSym>::map(IO &IO) {
+  // TODO: Print the subfields
+}
+
+template <> void SymbolRecordImpl<DefRangeSubfieldSym>::map(IO &IO) {
+  // TODO: Print the subfields
+}
+
+template <> void SymbolRecordImpl<DefRangeRegisterSym>::map(IO &IO) {
+  // TODO: Print the subfields
+}
+
+template <> void SymbolRecordImpl<DefRangeFramePointerRelSym>::map(IO &IO) {
+  // TODO: Print the subfields
+}
+
+template <> void SymbolRecordImpl<DefRangeSubfieldRegisterSym>::map(IO &IO) {
+  // TODO: Print the subfields
+}
+
+template <>
+void SymbolRecordImpl<DefRangeFramePointerRelFullScopeSym>::map(IO &IO) {
+  // TODO: Print the subfields
+}
+
+template <> void SymbolRecordImpl<DefRangeRegisterRelSym>::map(IO &IO) {
+  // TODO: Print the subfields
+}
+
+template <> void SymbolRecordImpl<BlockSym>::map(IO &IO) {
+  // TODO: Print the linkage name
+  IO.mapRequired("PtrParent", Symbol.Parent);
+  IO.mapRequired("PtrEnd", Symbol.End);
+  IO.mapRequired("CodeSize", Symbol.CodeSize);
+  IO.mapRequired("Segment", Symbol.Segment);
+  IO.mapRequired("BlockName", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<LabelSym>::map(IO &IO) {
+  // TODO: Print the linkage name
+  IO.mapRequired("Segment", Symbol.Segment);
+  IO.mapRequired("Flags", Symbol.Flags);
+  IO.mapRequired("Flags", Symbol.Flags);
+  IO.mapRequired("DisplayName", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<ObjNameSym>::map(IO &IO) {
+  IO.mapRequired("Signature", Symbol.Signature);
+  IO.mapRequired("ObjectName", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<Compile2Sym>::map(IO &IO) {
+  IO.mapRequired("Flags", Symbol.Flags);
+  IO.mapRequired("Machine", Symbol.Machine);
+  IO.mapRequired("FrontendMajor", Symbol.VersionFrontendMajor);
+  IO.mapRequired("FrontendMinor", Symbol.VersionFrontendMinor);
+  IO.mapRequired("FrontendBuild", Symbol.VersionFrontendBuild);
+  IO.mapRequired("BackendMajor", Symbol.VersionBackendMajor);
+  IO.mapRequired("BackendMinor", Symbol.VersionBackendMinor);
+  IO.mapRequired("BackendBuild", Symbol.VersionBackendBuild);
+  IO.mapRequired("Version", Symbol.Version);
+}
+
+template <> void SymbolRecordImpl<Compile3Sym>::map(IO &IO) {
+  IO.mapRequired("Flags", Symbol.Flags);
+  IO.mapRequired("Machine", Symbol.Machine);
+  IO.mapRequired("FrontendMajor", Symbol.VersionFrontendMajor);
+  IO.mapRequired("FrontendMinor", Symbol.VersionFrontendMinor);
+  IO.mapRequired("FrontendBuild", Symbol.VersionFrontendBuild);
+  IO.mapRequired("FrontendQFE", Symbol.VersionFrontendQFE);
+  IO.mapRequired("BackendMajor", Symbol.VersionBackendMajor);
+  IO.mapRequired("BackendMinor", Symbol.VersionBackendMinor);
+  IO.mapRequired("BackendBuild", Symbol.VersionBackendBuild);
+  IO.mapRequired("BackendQFE", Symbol.VersionBackendQFE);
+  IO.mapRequired("Version", Symbol.Version);
+}
+
+template <> void SymbolRecordImpl<FrameProcSym>::map(IO &IO) {
+  IO.mapRequired("TotalFrameBytes", Symbol.TotalFrameBytes);
+  IO.mapRequired("PaddingFrameBytes", Symbol.PaddingFrameBytes);
+  IO.mapRequired("OffsetToPadding", Symbol.OffsetToPadding);
+  IO.mapRequired("BytesOfCalleeSavedRegisters",
+                 Symbol.BytesOfCalleeSavedRegisters);
+  IO.mapRequired("OffsetOfExceptionHandler", Symbol.OffsetOfExceptionHandler);
+  IO.mapRequired("SectionIdOfExceptionHandler",
+                 Symbol.SectionIdOfExceptionHandler);
+  IO.mapRequired("Flags", Symbol.Flags);
+}
+
+template <> void SymbolRecordImpl<CallSiteInfoSym>::map(IO &IO) {
+  // TODO: Map Linkage Name
+  IO.mapRequired("Segment", Symbol.Segment);
+  IO.mapRequired("Type", Symbol.Type);
+}
+
+template <> void SymbolRecordImpl<FileStaticSym>::map(IO &IO) {
+  IO.mapRequired("Index", Symbol.Index);
+  IO.mapRequired("ModFilenameOffset", Symbol.ModFilenameOffset);
+  IO.mapRequired("Flags", Symbol.Flags);
+  IO.mapRequired("Name", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<HeapAllocationSiteSym>::map(IO &IO) {
+  // TODO: Map Linkage Name
+  IO.mapRequired("Segment", Symbol.Segment);
+  IO.mapRequired("CallInstructionSize", Symbol.CallInstructionSize);
+  IO.mapRequired("Type", Symbol.Type);
+}
+
+template <> void SymbolRecordImpl<FrameCookieSym>::map(IO &IO) {
+  // TODO: Map Linkage Name
+  IO.mapRequired("Register", Symbol.Register);
+  IO.mapRequired("CookieKind", Symbol.CookieKind);
+  IO.mapRequired("Flags", Symbol.Flags);
+}
+
+template <> void SymbolRecordImpl<CallerSym>::map(IO &IO) {
+  IO.mapRequired("FuncID", Symbol.Indices);
+}
+
+template <> void SymbolRecordImpl<UDTSym>::map(IO &IO) {
+  IO.mapRequired("Type", Symbol.Type);
+  IO.mapRequired("UDTName", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<BuildInfoSym>::map(IO &IO) {
+  IO.mapRequired("BuildId", Symbol.BuildId);
+}
+
+template <> void SymbolRecordImpl<BPRelativeSym>::map(IO &IO) {
+  IO.mapRequired("Offset", Symbol.Offset);
+  IO.mapRequired("Type", Symbol.Type);
+  IO.mapRequired("VarName", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<RegRelativeSym>::map(IO &IO) {
+  IO.mapRequired("Offset", Symbol.Offset);
+  IO.mapRequired("Type", Symbol.Type);
+  IO.mapRequired("Register", Symbol.Register);
+  IO.mapRequired("VarName", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<ConstantSym>::map(IO &IO) {
+  IO.mapRequired("Type", Symbol.Type);
+  IO.mapRequired("Value", Symbol.Value);
+  IO.mapRequired("Name", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<DataSym>::map(IO &IO) {
+  // TODO: Map linkage name
+  IO.mapRequired("Type", Symbol.Type);
+  IO.mapRequired("DisplayName", Symbol.Name);
+}
+
+template <> void SymbolRecordImpl<ThreadLocalDataSym>::map(IO &IO) {
+  // TODO: Map linkage name
+  IO.mapRequired("Type", Symbol.Type);
+  IO.mapRequired("DisplayName", Symbol.Name);
+}
+}
+}
+}
+
+CVSymbol CodeViewYAML::SymbolRecord::toCodeViewSymbol(
+    BumpPtrAllocator &Allocator) const {
+  return Symbol->toCodeViewSymbol(Allocator);
+}
+
+namespace llvm {
+namespace yaml {
+template <> struct MappingTraits<SymbolRecordBase> {
+  static void mapping(IO &io, SymbolRecordBase &Record) { Record.map(io); }
+};
+}
+}
+
+template <typename SymbolType>
+static inline Expected<CodeViewYAML::SymbolRecord>
+fromCodeViewSymbolImpl(CVSymbol Symbol) {
+  CodeViewYAML::SymbolRecord Result;
+
+  auto Impl = std::make_shared<SymbolRecordImpl<SymbolType>>(Symbol.kind());
+  if (auto EC = Impl->fromCodeViewSymbol(Symbol))
+    return std::move(EC);
+  Result.Symbol = Impl;
+  return Result;
+}
+
+Expected<CodeViewYAML::SymbolRecord>
+CodeViewYAML::SymbolRecord::fromCodeViewSymbol(CVSymbol Symbol) {
+#define SYMBOL_RECORD(EnumName, EnumVal, ClassName)                            \
+  case EnumName:                                                               \
+    return fromCodeViewSymbolImpl<ClassName>(Symbol);
+#define SYMBOL_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)           \
+  SYMBOL_RECORD(EnumName, EnumVal, ClassName)
+  switch (Symbol.kind()) {
+#include "llvm/DebugInfo/CodeView/CodeViewSymbols.def"
+  default: { llvm_unreachable("Unknown symbol kind!"); }
+  }
+  return make_error<CodeViewError>(cv_error_code::corrupt_record);
+}
+
+template <typename ConcreteType>
+static void mapSymbolRecordImpl(IO &IO, const char *Class, SymbolKind Kind,
+                                CodeViewYAML::SymbolRecord &Obj) {
+  if (!IO.outputting())
+    Obj.Symbol = std::make_shared<SymbolRecordImpl<ConcreteType>>(Kind);
+
+  IO.mapRequired(Class, *Obj.Symbol);
+}
+
+void MappingTraits<CodeViewYAML::SymbolRecord>::mapping(
+    IO &IO, CodeViewYAML::SymbolRecord &Obj) {
+  SymbolKind Kind;
+  if (IO.outputting())
+    Kind = Obj.Symbol->Kind;
+  IO.mapRequired("Kind", Kind);
+
+#define SYMBOL_RECORD(EnumName, EnumVal, ClassName)                            \
+  case EnumName:                                                               \
+    mapSymbolRecordImpl<ClassName>(IO, #ClassName, Kind, Obj);                 \
+    break;
+#define SYMBOL_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)           \
+  SYMBOL_RECORD(EnumName, EnumVal, ClassName)
+  switch (Kind) {
+#include "llvm/DebugInfo/CodeView/CodeViewSymbols.def"
+  default: { llvm_unreachable("Unknown symbol kind!"); }
+  }
+}

Added: llvm/trunk/lib/ObjectYAML/CodeViewYAMLTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/CodeViewYAMLTypes.cpp?rev=304278&view=auto
==============================================================================
--- llvm/trunk/lib/ObjectYAML/CodeViewYAMLTypes.cpp (added)
+++ llvm/trunk/lib/ObjectYAML/CodeViewYAMLTypes.cpp Tue May 30 23:17:13 2017
@@ -0,0 +1,712 @@
+//===- CodeViewYAMLTypes.cpp - CodeView YAMLIO types implementation -------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines classes for handling the YAML representation of CodeView
+// Debug Info.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/ObjectYAML/CodeViewYAMLTypes.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/StringSwitch.h"
+#include "llvm/DebugInfo/CodeView/CVTypeVisitor.h"
+#include "llvm/DebugInfo/CodeView/CodeViewError.h"
+#include "llvm/DebugInfo/CodeView/EnumTables.h"
+#include "llvm/DebugInfo/CodeView/TypeDeserializer.h"
+#include "llvm/DebugInfo/CodeView/TypeTableBuilder.h"
+
+using namespace llvm;
+using namespace llvm::codeview;
+using namespace llvm::CodeViewYAML;
+using namespace llvm::CodeViewYAML::detail;
+using namespace llvm::yaml;
+
+LLVM_YAML_IS_SEQUENCE_VECTOR(OneMethodRecord)
+LLVM_YAML_IS_SEQUENCE_VECTOR(StringRef)
+LLVM_YAML_IS_SEQUENCE_VECTOR(VFTableSlotKind)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(TypeIndex)
+
+LLVM_YAML_DECLARE_SCALAR_TRAITS(TypeIndex, false)
+LLVM_YAML_DECLARE_SCALAR_TRAITS(APSInt, false)
+
+LLVM_YAML_DECLARE_ENUM_TRAITS(TypeLeafKind)
+LLVM_YAML_DECLARE_ENUM_TRAITS(PointerToMemberRepresentation)
+LLVM_YAML_DECLARE_ENUM_TRAITS(VFTableSlotKind)
+LLVM_YAML_DECLARE_ENUM_TRAITS(CallingConvention)
+LLVM_YAML_DECLARE_ENUM_TRAITS(PointerKind)
+LLVM_YAML_DECLARE_ENUM_TRAITS(PointerMode)
+LLVM_YAML_DECLARE_ENUM_TRAITS(HfaKind)
+LLVM_YAML_DECLARE_ENUM_TRAITS(MemberAccess)
+LLVM_YAML_DECLARE_ENUM_TRAITS(MethodKind)
+LLVM_YAML_DECLARE_ENUM_TRAITS(WindowsRTClassKind)
+LLVM_YAML_DECLARE_ENUM_TRAITS(LabelType)
+
+LLVM_YAML_DECLARE_BITSET_TRAITS(PointerOptions)
+LLVM_YAML_DECLARE_BITSET_TRAITS(ModifierOptions)
+LLVM_YAML_DECLARE_BITSET_TRAITS(FunctionOptions)
+LLVM_YAML_DECLARE_BITSET_TRAITS(ClassOptions)
+LLVM_YAML_DECLARE_BITSET_TRAITS(MethodOptions)
+
+LLVM_YAML_DECLARE_MAPPING_TRAITS(OneMethodRecord)
+LLVM_YAML_DECLARE_MAPPING_TRAITS(MemberPointerInfo)
+
+namespace llvm {
+namespace CodeViewYAML {
+namespace detail {
+
+struct LeafRecordBase {
+  TypeLeafKind Kind;
+  explicit LeafRecordBase(TypeLeafKind K) : Kind(K) {}
+
+  virtual ~LeafRecordBase() {}
+  virtual void map(yaml::IO &io) = 0;
+  virtual CVType toCodeViewRecord(BumpPtrAllocator &Allocator) const = 0;
+  virtual Error fromCodeViewRecord(CVType Type) = 0;
+};
+
+template <typename T> struct LeafRecordImpl : public LeafRecordBase {
+  explicit LeafRecordImpl(TypeLeafKind K)
+      : LeafRecordBase(K), Record(static_cast<TypeRecordKind>(K)) {}
+
+  void map(yaml::IO &io) override;
+
+  Error fromCodeViewRecord(CVType Type) override {
+    return TypeDeserializer::deserializeAs<T>(Type, Record);
+  }
+
+  CVType toCodeViewRecord(BumpPtrAllocator &Allocator) const override {
+    TypeTableBuilder Table(Allocator);
+    Table.writeKnownType(Record);
+    return CVType(Kind, Table.records().front());
+  }
+
+  mutable T Record;
+};
+
+template <> struct LeafRecordImpl<FieldListRecord> : public LeafRecordBase {
+  explicit LeafRecordImpl(TypeLeafKind K) : LeafRecordBase(K) {}
+
+  void map(yaml::IO &io) override;
+  CVType toCodeViewRecord(BumpPtrAllocator &Allocator) const override;
+  Error fromCodeViewRecord(CVType Type) override;
+
+  std::vector<MemberRecord> Members;
+};
+
+struct MemberRecordBase {
+  TypeLeafKind Kind;
+  explicit MemberRecordBase(TypeLeafKind K) : Kind(K) {}
+
+  virtual ~MemberRecordBase() {}
+  virtual void map(yaml::IO &io) = 0;
+  virtual void writeTo(FieldListRecordBuilder &FLRB) = 0;
+};
+
+template <typename T> struct MemberRecordImpl : public MemberRecordBase {
+  explicit MemberRecordImpl(TypeLeafKind K)
+      : MemberRecordBase(K), Record(static_cast<TypeRecordKind>(K)) {}
+  void map(yaml::IO &io) override;
+
+  void writeTo(FieldListRecordBuilder &FLRB) override {
+    FLRB.writeMemberType(Record);
+  }
+
+  mutable T Record;
+};
+}
+}
+}
+
+void ScalarTraits<TypeIndex>::output(const TypeIndex &S, void *,
+                                     llvm::raw_ostream &OS) {
+  OS << S.getIndex();
+}
+
+StringRef ScalarTraits<TypeIndex>::input(StringRef Scalar, void *Ctx,
+                                         TypeIndex &S) {
+  uint32_t I;
+  StringRef Result = ScalarTraits<uint32_t>::input(Scalar, Ctx, I);
+  S.setIndex(I);
+  return Result;
+}
+
+void ScalarTraits<APSInt>::output(const APSInt &S, void *,
+                                  llvm::raw_ostream &OS) {
+  S.print(OS, true);
+}
+
+StringRef ScalarTraits<APSInt>::input(StringRef Scalar, void *Ctx, APSInt &S) {
+  S = APSInt(Scalar);
+  return "";
+}
+
+void ScalarEnumerationTraits<TypeLeafKind>::enumeration(IO &io,
+                                                        TypeLeafKind &Value) {
+#define CV_TYPE(name, val) io.enumCase(Value, #name, name);
+#include "llvm/DebugInfo/CodeView/CodeViewTypes.def"
+#undef CV_TYPE
+}
+
+void ScalarEnumerationTraits<PointerToMemberRepresentation>::enumeration(
+    IO &IO, PointerToMemberRepresentation &Value) {
+  IO.enumCase(Value, "Unknown", PointerToMemberRepresentation::Unknown);
+  IO.enumCase(Value, "SingleInheritanceData",
+              PointerToMemberRepresentation::SingleInheritanceData);
+  IO.enumCase(Value, "MultipleInheritanceData",
+              PointerToMemberRepresentation::MultipleInheritanceData);
+  IO.enumCase(Value, "VirtualInheritanceData",
+              PointerToMemberRepresentation::VirtualInheritanceData);
+  IO.enumCase(Value, "GeneralData", PointerToMemberRepresentation::GeneralData);
+  IO.enumCase(Value, "SingleInheritanceFunction",
+              PointerToMemberRepresentation::SingleInheritanceFunction);
+  IO.enumCase(Value, "MultipleInheritanceFunction",
+              PointerToMemberRepresentation::MultipleInheritanceFunction);
+  IO.enumCase(Value, "VirtualInheritanceFunction",
+              PointerToMemberRepresentation::VirtualInheritanceFunction);
+  IO.enumCase(Value, "GeneralFunction",
+              PointerToMemberRepresentation::GeneralFunction);
+}
+
+void ScalarEnumerationTraits<VFTableSlotKind>::enumeration(
+    IO &IO, VFTableSlotKind &Kind) {
+  IO.enumCase(Kind, "Near16", VFTableSlotKind::Near16);
+  IO.enumCase(Kind, "Far16", VFTableSlotKind::Far16);
+  IO.enumCase(Kind, "This", VFTableSlotKind::This);
+  IO.enumCase(Kind, "Outer", VFTableSlotKind::Outer);
+  IO.enumCase(Kind, "Meta", VFTableSlotKind::Meta);
+  IO.enumCase(Kind, "Near", VFTableSlotKind::Near);
+  IO.enumCase(Kind, "Far", VFTableSlotKind::Far);
+}
+
+void ScalarEnumerationTraits<CallingConvention>::enumeration(
+    IO &IO, CallingConvention &Value) {
+  IO.enumCase(Value, "NearC", CallingConvention::NearC);
+  IO.enumCase(Value, "FarC", CallingConvention::FarC);
+  IO.enumCase(Value, "NearPascal", CallingConvention::NearPascal);
+  IO.enumCase(Value, "FarPascal", CallingConvention::FarPascal);
+  IO.enumCase(Value, "NearFast", CallingConvention::NearFast);
+  IO.enumCase(Value, "FarFast", CallingConvention::FarFast);
+  IO.enumCase(Value, "NearStdCall", CallingConvention::NearStdCall);
+  IO.enumCase(Value, "FarStdCall", CallingConvention::FarStdCall);
+  IO.enumCase(Value, "NearSysCall", CallingConvention::NearSysCall);
+  IO.enumCase(Value, "FarSysCall", CallingConvention::FarSysCall);
+  IO.enumCase(Value, "ThisCall", CallingConvention::ThisCall);
+  IO.enumCase(Value, "MipsCall", CallingConvention::MipsCall);
+  IO.enumCase(Value, "Generic", CallingConvention::Generic);
+  IO.enumCase(Value, "AlphaCall", CallingConvention::AlphaCall);
+  IO.enumCase(Value, "PpcCall", CallingConvention::PpcCall);
+  IO.enumCase(Value, "SHCall", CallingConvention::SHCall);
+  IO.enumCase(Value, "ArmCall", CallingConvention::ArmCall);
+  IO.enumCase(Value, "AM33Call", CallingConvention::AM33Call);
+  IO.enumCase(Value, "TriCall", CallingConvention::TriCall);
+  IO.enumCase(Value, "SH5Call", CallingConvention::SH5Call);
+  IO.enumCase(Value, "M32RCall", CallingConvention::M32RCall);
+  IO.enumCase(Value, "ClrCall", CallingConvention::ClrCall);
+  IO.enumCase(Value, "Inline", CallingConvention::Inline);
+  IO.enumCase(Value, "NearVector", CallingConvention::NearVector);
+}
+
+void ScalarEnumerationTraits<PointerKind>::enumeration(IO &IO,
+                                                       PointerKind &Kind) {
+  IO.enumCase(Kind, "Near16", PointerKind::Near16);
+  IO.enumCase(Kind, "Far16", PointerKind::Far16);
+  IO.enumCase(Kind, "Huge16", PointerKind::Huge16);
+  IO.enumCase(Kind, "BasedOnSegment", PointerKind::BasedOnSegment);
+  IO.enumCase(Kind, "BasedOnValue", PointerKind::BasedOnValue);
+  IO.enumCase(Kind, "BasedOnSegmentValue", PointerKind::BasedOnSegmentValue);
+  IO.enumCase(Kind, "BasedOnAddress", PointerKind::BasedOnAddress);
+  IO.enumCase(Kind, "BasedOnSegmentAddress",
+              PointerKind::BasedOnSegmentAddress);
+  IO.enumCase(Kind, "BasedOnType", PointerKind::BasedOnType);
+  IO.enumCase(Kind, "BasedOnSelf", PointerKind::BasedOnSelf);
+  IO.enumCase(Kind, "Near32", PointerKind::Near32);
+  IO.enumCase(Kind, "Far32", PointerKind::Far32);
+  IO.enumCase(Kind, "Near64", PointerKind::Near64);
+}
+
+void ScalarEnumerationTraits<PointerMode>::enumeration(IO &IO,
+                                                       PointerMode &Mode) {
+  IO.enumCase(Mode, "Pointer", PointerMode::Pointer);
+  IO.enumCase(Mode, "LValueReference", PointerMode::LValueReference);
+  IO.enumCase(Mode, "PointerToDataMember", PointerMode::PointerToDataMember);
+  IO.enumCase(Mode, "PointerToMemberFunction",
+              PointerMode::PointerToMemberFunction);
+  IO.enumCase(Mode, "RValueReference", PointerMode::RValueReference);
+}
+
+void ScalarEnumerationTraits<HfaKind>::enumeration(IO &IO, HfaKind &Value) {
+  IO.enumCase(Value, "None", HfaKind::None);
+  IO.enumCase(Value, "Float", HfaKind::Float);
+  IO.enumCase(Value, "Double", HfaKind::Double);
+  IO.enumCase(Value, "Other", HfaKind::Other);
+}
+
+void ScalarEnumerationTraits<MemberAccess>::enumeration(IO &IO,
+                                                        MemberAccess &Access) {
+  IO.enumCase(Access, "None", MemberAccess::None);
+  IO.enumCase(Access, "Private", MemberAccess::Private);
+  IO.enumCase(Access, "Protected", MemberAccess::Protected);
+  IO.enumCase(Access, "Public", MemberAccess::Public);
+}
+
+void ScalarEnumerationTraits<MethodKind>::enumeration(IO &IO,
+                                                      MethodKind &Kind) {
+  IO.enumCase(Kind, "Vanilla", MethodKind::Vanilla);
+  IO.enumCase(Kind, "Virtual", MethodKind::Virtual);
+  IO.enumCase(Kind, "Static", MethodKind::Static);
+  IO.enumCase(Kind, "Friend", MethodKind::Friend);
+  IO.enumCase(Kind, "IntroducingVirtual", MethodKind::IntroducingVirtual);
+  IO.enumCase(Kind, "PureVirtual", MethodKind::PureVirtual);
+  IO.enumCase(Kind, "PureIntroducingVirtual",
+              MethodKind::PureIntroducingVirtual);
+}
+
+void ScalarEnumerationTraits<WindowsRTClassKind>::enumeration(
+    IO &IO, WindowsRTClassKind &Value) {
+  IO.enumCase(Value, "None", WindowsRTClassKind::None);
+  IO.enumCase(Value, "Ref", WindowsRTClassKind::RefClass);
+  IO.enumCase(Value, "Value", WindowsRTClassKind::ValueClass);
+  IO.enumCase(Value, "Interface", WindowsRTClassKind::Interface);
+}
+
+void ScalarEnumerationTraits<LabelType>::enumeration(IO &IO, LabelType &Value) {
+  IO.enumCase(Value, "Near", LabelType::Near);
+  IO.enumCase(Value, "Far", LabelType::Far);
+}
+
+void ScalarBitSetTraits<PointerOptions>::bitset(IO &IO,
+                                                PointerOptions &Options) {
+  IO.bitSetCase(Options, "None", PointerOptions::None);
+  IO.bitSetCase(Options, "Flat32", PointerOptions::Flat32);
+  IO.bitSetCase(Options, "Volatile", PointerOptions::Volatile);
+  IO.bitSetCase(Options, "Const", PointerOptions::Const);
+  IO.bitSetCase(Options, "Unaligned", PointerOptions::Unaligned);
+  IO.bitSetCase(Options, "Restrict", PointerOptions::Restrict);
+  IO.bitSetCase(Options, "WinRTSmartPointer",
+                PointerOptions::WinRTSmartPointer);
+}
+
+void ScalarBitSetTraits<ModifierOptions>::bitset(IO &IO,
+                                                 ModifierOptions &Options) {
+  IO.bitSetCase(Options, "None", ModifierOptions::None);
+  IO.bitSetCase(Options, "Const", ModifierOptions::Const);
+  IO.bitSetCase(Options, "Volatile", ModifierOptions::Volatile);
+  IO.bitSetCase(Options, "Unaligned", ModifierOptions::Unaligned);
+}
+
+void ScalarBitSetTraits<FunctionOptions>::bitset(IO &IO,
+                                                 FunctionOptions &Options) {
+  IO.bitSetCase(Options, "None", FunctionOptions::None);
+  IO.bitSetCase(Options, "CxxReturnUdt", FunctionOptions::CxxReturnUdt);
+  IO.bitSetCase(Options, "Constructor", FunctionOptions::Constructor);
+  IO.bitSetCase(Options, "ConstructorWithVirtualBases",
+                FunctionOptions::ConstructorWithVirtualBases);
+}
+
+void ScalarBitSetTraits<ClassOptions>::bitset(IO &IO, ClassOptions &Options) {
+  IO.bitSetCase(Options, "None", ClassOptions::None);
+  IO.bitSetCase(Options, "HasConstructorOrDestructor",
+                ClassOptions::HasConstructorOrDestructor);
+  IO.bitSetCase(Options, "HasOverloadedOperator",
+                ClassOptions::HasOverloadedOperator);
+  IO.bitSetCase(Options, "Nested", ClassOptions::Nested);
+  IO.bitSetCase(Options, "ContainsNestedClass",
+                ClassOptions::ContainsNestedClass);
+  IO.bitSetCase(Options, "HasOverloadedAssignmentOperator",
+                ClassOptions::HasOverloadedAssignmentOperator);
+  IO.bitSetCase(Options, "HasConversionOperator",
+                ClassOptions::HasConversionOperator);
+  IO.bitSetCase(Options, "ForwardReference", ClassOptions::ForwardReference);
+  IO.bitSetCase(Options, "Scoped", ClassOptions::Scoped);
+  IO.bitSetCase(Options, "HasUniqueName", ClassOptions::HasUniqueName);
+  IO.bitSetCase(Options, "Sealed", ClassOptions::Sealed);
+  IO.bitSetCase(Options, "Intrinsic", ClassOptions::Intrinsic);
+}
+
+void ScalarBitSetTraits<MethodOptions>::bitset(IO &IO, MethodOptions &Options) {
+  IO.bitSetCase(Options, "None", MethodOptions::None);
+  IO.bitSetCase(Options, "Pseudo", MethodOptions::Pseudo);
+  IO.bitSetCase(Options, "NoInherit", MethodOptions::NoInherit);
+  IO.bitSetCase(Options, "NoConstruct", MethodOptions::NoConstruct);
+  IO.bitSetCase(Options, "CompilerGenerated", MethodOptions::CompilerGenerated);
+  IO.bitSetCase(Options, "Sealed", MethodOptions::Sealed);
+}
+
+void MappingTraits<MemberPointerInfo>::mapping(IO &IO, MemberPointerInfo &MPI) {
+  IO.mapRequired("ContainingType", MPI.ContainingType);
+  IO.mapRequired("Representation", MPI.Representation);
+}
+
+namespace llvm {
+namespace CodeViewYAML {
+namespace detail {
+template <> void LeafRecordImpl<ModifierRecord>::map(IO &IO) {
+  IO.mapRequired("ModifiedType", Record.ModifiedType);
+  IO.mapRequired("Modifiers", Record.Modifiers);
+}
+
+template <> void LeafRecordImpl<ProcedureRecord>::map(IO &IO) {
+  IO.mapRequired("ReturnType", Record.ReturnType);
+  IO.mapRequired("CallConv", Record.CallConv);
+  IO.mapRequired("Options", Record.Options);
+  IO.mapRequired("ParameterCount", Record.ParameterCount);
+  IO.mapRequired("ArgumentList", Record.ArgumentList);
+}
+
+template <> void LeafRecordImpl<MemberFunctionRecord>::map(IO &IO) {
+  IO.mapRequired("ReturnType", Record.ReturnType);
+  IO.mapRequired("ClassType", Record.ClassType);
+  IO.mapRequired("ThisType", Record.ThisType);
+  IO.mapRequired("CallConv", Record.CallConv);
+  IO.mapRequired("Options", Record.Options);
+  IO.mapRequired("ParameterCount", Record.ParameterCount);
+  IO.mapRequired("ArgumentList", Record.ArgumentList);
+  IO.mapRequired("ThisPointerAdjustment", Record.ThisPointerAdjustment);
+}
+
+template <> void LeafRecordImpl<LabelRecord>::map(IO &IO) {
+  IO.mapRequired("Mode", Record.Mode);
+}
+
+template <> void LeafRecordImpl<MemberFuncIdRecord>::map(IO &IO) {
+  IO.mapRequired("ClassType", Record.ClassType);
+  IO.mapRequired("FunctionType", Record.FunctionType);
+  IO.mapRequired("Name", Record.Name);
+}
+
+template <> void LeafRecordImpl<ArgListRecord>::map(IO &IO) {
+  IO.mapRequired("ArgIndices", Record.ArgIndices);
+}
+
+template <> void LeafRecordImpl<StringListRecord>::map(IO &IO) {
+  IO.mapRequired("StringIndices", Record.StringIndices);
+}
+
+template <> void LeafRecordImpl<PointerRecord>::map(IO &IO) {
+  IO.mapRequired("ReferentType", Record.ReferentType);
+  IO.mapRequired("Attrs", Record.Attrs);
+  IO.mapOptional("MemberInfo", Record.MemberInfo);
+}
+
+template <> void LeafRecordImpl<ArrayRecord>::map(IO &IO) {
+  IO.mapRequired("ElementType", Record.ElementType);
+  IO.mapRequired("IndexType", Record.IndexType);
+  IO.mapRequired("Size", Record.Size);
+  IO.mapRequired("Name", Record.Name);
+}
+
+void LeafRecordImpl<FieldListRecord>::map(IO &IO) {
+  IO.mapRequired("FieldList", Members);
+}
+}
+}
+}
+
+namespace {
+class MemberRecordConversionVisitor : public TypeVisitorCallbacks {
+public:
+  explicit MemberRecordConversionVisitor(std::vector<MemberRecord> &Records)
+      : Records(Records) {}
+
+#define TYPE_RECORD(EnumName, EnumVal, Name)
+#define MEMBER_RECORD(EnumName, EnumVal, Name)                                 \
+  Error visitKnownMember(CVMemberRecord &CVR, Name##Record &Record) override { \
+    return visitKnownMemberImpl(Record);                                       \
+  }
+#define TYPE_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)
+#define MEMBER_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)
+#include "llvm/DebugInfo/CodeView/CodeViewTypes.def"
+private:
+  template <typename T> Error visitKnownMemberImpl(T &Record) {
+    TypeLeafKind K = static_cast<TypeLeafKind>(Record.getKind());
+    auto Impl = std::make_shared<MemberRecordImpl<T>>(K);
+    Impl->Record = Record;
+    Records.push_back(MemberRecord{Impl});
+    return Error::success();
+  }
+
+  std::vector<MemberRecord> &Records;
+};
+}
+
+Error LeafRecordImpl<FieldListRecord>::fromCodeViewRecord(CVType Type) {
+  MemberRecordConversionVisitor V(Members);
+  return visitMemberRecordStream(Type.content(), V);
+}
+
+CVType LeafRecordImpl<FieldListRecord>::toCodeViewRecord(
+    BumpPtrAllocator &Allocator) const {
+  TypeTableBuilder TTB(Allocator);
+  FieldListRecordBuilder FLRB(TTB);
+  FLRB.begin();
+  for (const auto &Member : Members) {
+    Member.Member->writeTo(FLRB);
+  }
+  FLRB.end(true);
+  return CVType(Kind, TTB.records().front());
+}
+
+void MappingTraits<OneMethodRecord>::mapping(IO &io, OneMethodRecord &Record) {
+  io.mapRequired("Type", Record.Type);
+  io.mapRequired("Attrs", Record.Attrs.Attrs);
+  io.mapRequired("VFTableOffset", Record.VFTableOffset);
+  io.mapRequired("Name", Record.Name);
+}
+
+namespace llvm {
+namespace CodeViewYAML {
+namespace detail {
+template <> void LeafRecordImpl<ClassRecord>::map(IO &IO) {
+  IO.mapRequired("MemberCount", Record.MemberCount);
+  IO.mapRequired("Options", Record.Options);
+  IO.mapRequired("FieldList", Record.FieldList);
+  IO.mapRequired("Name", Record.Name);
+  IO.mapRequired("UniqueName", Record.UniqueName);
+
+  IO.mapRequired("DerivationList", Record.DerivationList);
+  IO.mapRequired("VTableShape", Record.VTableShape);
+  IO.mapRequired("Size", Record.Size);
+}
+
+template <> void LeafRecordImpl<UnionRecord>::map(IO &IO) {
+  IO.mapRequired("MemberCount", Record.MemberCount);
+  IO.mapRequired("Options", Record.Options);
+  IO.mapRequired("FieldList", Record.FieldList);
+  IO.mapRequired("Name", Record.Name);
+  IO.mapRequired("UniqueName", Record.UniqueName);
+
+  IO.mapRequired("Size", Record.Size);
+}
+
+template <> void LeafRecordImpl<EnumRecord>::map(IO &IO) {
+  IO.mapRequired("NumEnumerators", Record.MemberCount);
+  IO.mapRequired("Options", Record.Options);
+  IO.mapRequired("FieldList", Record.FieldList);
+  IO.mapRequired("Name", Record.Name);
+  IO.mapRequired("UniqueName", Record.UniqueName);
+
+  IO.mapRequired("UnderlyingType", Record.UnderlyingType);
+}
+
+template <> void LeafRecordImpl<BitFieldRecord>::map(IO &IO) {
+  IO.mapRequired("Type", Record.Type);
+  IO.mapRequired("BitSize", Record.BitSize);
+  IO.mapRequired("BitOffset", Record.BitOffset);
+}
+
+template <> void LeafRecordImpl<VFTableShapeRecord>::map(IO &IO) {
+  IO.mapRequired("Slots", Record.Slots);
+}
+
+template <> void LeafRecordImpl<TypeServer2Record>::map(IO &IO) {
+  IO.mapRequired("Guid", Record.Guid);
+  IO.mapRequired("Age", Record.Age);
+  IO.mapRequired("Name", Record.Name);
+}
+
+template <> void LeafRecordImpl<StringIdRecord>::map(IO &IO) {
+  IO.mapRequired("Id", Record.Id);
+  IO.mapRequired("String", Record.String);
+}
+
+template <> void LeafRecordImpl<FuncIdRecord>::map(IO &IO) {
+  IO.mapRequired("ParentScope", Record.ParentScope);
+  IO.mapRequired("FunctionType", Record.FunctionType);
+  IO.mapRequired("Name", Record.Name);
+}
+
+template <> void LeafRecordImpl<UdtSourceLineRecord>::map(IO &IO) {
+  IO.mapRequired("UDT", Record.UDT);
+  IO.mapRequired("SourceFile", Record.SourceFile);
+  IO.mapRequired("LineNumber", Record.LineNumber);
+}
+
+template <> void LeafRecordImpl<UdtModSourceLineRecord>::map(IO &IO) {
+  IO.mapRequired("UDT", Record.UDT);
+  IO.mapRequired("SourceFile", Record.SourceFile);
+  IO.mapRequired("LineNumber", Record.LineNumber);
+  IO.mapRequired("Module", Record.Module);
+}
+
+template <> void LeafRecordImpl<BuildInfoRecord>::map(IO &IO) {
+  IO.mapRequired("ArgIndices", Record.ArgIndices);
+}
+
+template <> void LeafRecordImpl<VFTableRecord>::map(IO &IO) {
+  IO.mapRequired("CompleteClass", Record.CompleteClass);
+  IO.mapRequired("OverriddenVFTable", Record.OverriddenVFTable);
+  IO.mapRequired("VFPtrOffset", Record.VFPtrOffset);
+  IO.mapRequired("MethodNames", Record.MethodNames);
+}
+
+template <> void LeafRecordImpl<MethodOverloadListRecord>::map(IO &IO) {
+  IO.mapRequired("Methods", Record.Methods);
+}
+
+template <> void MemberRecordImpl<OneMethodRecord>::map(IO &IO) {
+  MappingTraits<OneMethodRecord>::mapping(IO, Record);
+}
+
+template <> void MemberRecordImpl<OverloadedMethodRecord>::map(IO &IO) {
+  IO.mapRequired("NumOverloads", Record.NumOverloads);
+  IO.mapRequired("MethodList", Record.MethodList);
+  IO.mapRequired("Name", Record.Name);
+}
+
+template <> void MemberRecordImpl<NestedTypeRecord>::map(IO &IO) {
+  IO.mapRequired("Type", Record.Type);
+  IO.mapRequired("Name", Record.Name);
+}
+
+template <> void MemberRecordImpl<DataMemberRecord>::map(IO &IO) {
+  IO.mapRequired("Attrs", Record.Attrs.Attrs);
+  IO.mapRequired("Type", Record.Type);
+  IO.mapRequired("FieldOffset", Record.FieldOffset);
+  IO.mapRequired("Name", Record.Name);
+}
+
+template <> void MemberRecordImpl<StaticDataMemberRecord>::map(IO &IO) {
+  IO.mapRequired("Attrs", Record.Attrs.Attrs);
+  IO.mapRequired("Type", Record.Type);
+  IO.mapRequired("Name", Record.Name);
+}
+
+template <> void MemberRecordImpl<EnumeratorRecord>::map(IO &IO) {
+  IO.mapRequired("Attrs", Record.Attrs.Attrs);
+  IO.mapRequired("Value", Record.Value);
+  IO.mapRequired("Name", Record.Name);
+}
+
+template <> void MemberRecordImpl<VFPtrRecord>::map(IO &IO) {
+  IO.mapRequired("Type", Record.Type);
+}
+
+template <> void MemberRecordImpl<BaseClassRecord>::map(IO &IO) {
+  IO.mapRequired("Attrs", Record.Attrs.Attrs);
+  IO.mapRequired("Type", Record.Type);
+  IO.mapRequired("Offset", Record.Offset);
+}
+
+template <> void MemberRecordImpl<VirtualBaseClassRecord>::map(IO &IO) {
+  IO.mapRequired("Attrs", Record.Attrs.Attrs);
+  IO.mapRequired("BaseType", Record.BaseType);
+  IO.mapRequired("VBPtrType", Record.VBPtrType);
+  IO.mapRequired("VBPtrOffset", Record.VBPtrOffset);
+  IO.mapRequired("VTableIndex", Record.VTableIndex);
+}
+
+template <> void MemberRecordImpl<ListContinuationRecord>::map(IO &IO) {
+  IO.mapRequired("ContinuationIndex", Record.ContinuationIndex);
+}
+}
+}
+}
+
+template <typename T>
+static inline Expected<LeafRecord> fromCodeViewRecordImpl(CVType Type) {
+  LeafRecord Result;
+
+  auto Impl = std::make_shared<LeafRecordImpl<T>>(Type.kind());
+  if (auto EC = Impl->fromCodeViewRecord(Type))
+    return std::move(EC);
+  Result.Leaf = Impl;
+  return Result;
+}
+
+Expected<LeafRecord> LeafRecord::fromCodeViewRecord(CVType Type) {
+#define TYPE_RECORD(EnumName, EnumVal, ClassName)                              \
+  case EnumName:                                                               \
+    return fromCodeViewRecordImpl<ClassName##Record>(Type);
+#define TYPE_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)             \
+  TYPE_RECORD(EnumName, EnumVal, ClassName)
+#define MEMBER_RECORD(EnumName, EnumVal, ClassName)
+#define MEMBER_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)
+  switch (Type.kind()) {
+#include "llvm/DebugInfo/CodeView/CodeViewTypes.def"
+  default: { llvm_unreachable("Unknown leaf kind!"); }
+  }
+  return make_error<CodeViewError>(cv_error_code::corrupt_record);
+}
+
+CVType LeafRecord::toCodeViewRecord(BumpPtrAllocator &Allocator) const {
+  return Leaf->toCodeViewRecord(Allocator);
+}
+
+namespace llvm {
+namespace yaml {
+template <> struct MappingTraits<LeafRecordBase> {
+  static void mapping(IO &io, LeafRecordBase &Record) { Record.map(io); }
+};
+
+template <> struct MappingTraits<MemberRecordBase> {
+  static void mapping(IO &io, MemberRecordBase &Record) { Record.map(io); }
+};
+}
+}
+
+template <typename ConcreteType>
+static void mapLeafRecordImpl(IO &IO, const char *Class, TypeLeafKind Kind,
+                              LeafRecord &Obj) {
+  if (!IO.outputting())
+    Obj.Leaf = std::make_shared<LeafRecordImpl<ConcreteType>>(Kind);
+
+  if (Kind == LF_FIELDLIST)
+    Obj.Leaf->map(IO);
+  else
+    IO.mapRequired(Class, *Obj.Leaf);
+}
+
+void MappingTraits<LeafRecord>::mapping(IO &IO, LeafRecord &Obj) {
+  TypeLeafKind Kind;
+  if (IO.outputting())
+    Kind = Obj.Leaf->Kind;
+  IO.mapRequired("Kind", Kind);
+
+#define TYPE_RECORD(EnumName, EnumVal, ClassName)                              \
+  case EnumName:                                                               \
+    mapLeafRecordImpl<ClassName##Record>(IO, #ClassName, Kind, Obj);           \
+    break;
+#define TYPE_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)             \
+  TYPE_RECORD(EnumName, EnumVal, ClassName)
+#define MEMBER_RECORD(EnumName, EnumVal, ClassName)
+#define MEMBER_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)
+  switch (Kind) {
+#include "llvm/DebugInfo/CodeView/CodeViewTypes.def"
+  default: { llvm_unreachable("Unknown leaf kind!"); }
+  }
+}
+
+template <typename ConcreteType>
+static void mapMemberRecordImpl(IO &IO, const char *Class, TypeLeafKind Kind,
+                                MemberRecord &Obj) {
+  if (!IO.outputting())
+    Obj.Member = std::make_shared<MemberRecordImpl<ConcreteType>>(Kind);
+
+  IO.mapRequired(Class, *Obj.Member);
+}
+
+void MappingTraits<MemberRecord>::mapping(IO &IO, MemberRecord &Obj) {
+  TypeLeafKind Kind;
+  if (IO.outputting())
+    Kind = Obj.Member->Kind;
+  IO.mapRequired("Kind", Kind);
+
+#define MEMBER_RECORD(EnumName, EnumVal, ClassName)                            \
+  case EnumName:                                                               \
+    mapMemberRecordImpl<ClassName##Record>(IO, #ClassName, Kind, Obj);         \
+    break;
+#define MEMBER_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)           \
+  MEMBER_RECORD(EnumName, EnumVal, ClassName)
+#define TYPE_RECORD(EnumName, EnumVal, ClassName)
+#define TYPE_RECORD_ALIAS(EnumName, EnumVal, AliasName, ClassName)
+  switch (Kind) {
+#include "llvm/DebugInfo/CodeView/CodeViewTypes.def"
+  default: { llvm_unreachable("Unknown member kind!"); }
+  }
+}

Modified: llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp?rev=304278&r1=304277&r2=304278&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp (original)
+++ llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp Tue May 30 23:17:13 2017
@@ -21,6 +21,7 @@
 #include "llvm/DebugInfo/PDB/Native/TpiHashing.h"
 #include "llvm/DebugInfo/PDB/PDBExtras.h"
 #include "llvm/DebugInfo/PDB/PDBTypes.h"
+#include "llvm/ObjectYAML/CodeViewYAMLTypes.h"
 
 using namespace llvm;
 using namespace llvm::pdb;

Modified: llvm/trunk/tools/llvm-pdbdump/PdbYaml.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/PdbYaml.h?rev=304278&r1=304277&r2=304278&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-pdbdump/PdbYaml.h (original)
+++ llvm/trunk/tools/llvm-pdbdump/PdbYaml.h Tue May 30 23:17:13 2017
@@ -19,7 +19,9 @@
 #include "llvm/DebugInfo/PDB/Native/PDBFile.h"
 #include "llvm/DebugInfo/PDB/Native/RawConstants.h"
 #include "llvm/DebugInfo/PDB/PDBTypes.h"
-#include "llvm/ObjectYAML/CodeViewYAML.h"
+#include "llvm/ObjectYAML/CodeViewYAMLDebugSections.h"
+#include "llvm/ObjectYAML/CodeViewYAMLSymbols.h"
+#include "llvm/ObjectYAML/CodeViewYAMLTypes.h"
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/YAMLTraits.h"
 

Modified: llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.cpp?rev=304278&r1=304277&r2=304278&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.cpp (original)
+++ llvm/trunk/tools/llvm-pdbdump/YAMLOutputStyle.cpp Tue May 30 23:17:13 2017
@@ -28,7 +28,6 @@
 #include "llvm/DebugInfo/PDB/Native/RawConstants.h"
 #include "llvm/DebugInfo/PDB/Native/RawError.h"
 #include "llvm/DebugInfo/PDB/Native/TpiStream.h"
-#include "llvm/ObjectYAML/CodeViewYAML.h"
 
 using namespace llvm;
 using namespace llvm::codeview;

Modified: llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp?rev=304278&r1=304277&r2=304278&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp (original)
+++ llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp Tue May 30 23:17:13 2017
@@ -61,7 +61,6 @@
 #include "llvm/DebugInfo/PDB/PDBSymbolExe.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolFunc.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolThunk.h"
-#include "llvm/ObjectYAML/CodeViewYAML.h"
 #include "llvm/Support/BinaryByteStream.h"
 #include "llvm/Support/COM.h"
 #include "llvm/Support/CommandLine.h"




More information about the llvm-commits mailing list