1 files changed, 105 insertions, 195 deletions

diff --git a/llvm/tools/llvm-pdbdump/YamlSymbolDumper.cpp b/llvm/tools/llvm-pdbdump/YamlSymbolDumper.cpp
index 210260a03b5..c2df26f7cd2 100644
--- a/llvm/tools/llvm-pdbdump/YamlSymbolDumper.cpp
+++ b/llvm/tools/llvm-pdbdump/YamlSymbolDumper.cpp
@@ -38,197 +38,105 @@ void ScalarEnumerationTraits<SymbolKind>::enumeration(IO &io,
     io.enumCase(Value, E.Name.str().c_str(), E.Value);
 }
 
-template <> struct ScalarBitSetTraits<CompileSym2Flags> {
-  static void 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));
-    }
-  }
-};
-
-template <> struct ScalarBitSetTraits<CompileSym3Flags> {
-  static void 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));
-    }
-  }
-};
-
-template <> struct ScalarBitSetTraits<ExportFlags> {
-  static void 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));
-    }
-  }
-};
-
-template <> struct ScalarBitSetTraits<LocalSymFlags> {
-  static void 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));
-    }
-  }
-};
-
-template <> struct ScalarBitSetTraits<ProcSymFlags> {
-  static void 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));
-    }
-  }
-};
-
-template <> struct ScalarBitSetTraits<FrameProcedureOptions> {
-  static void 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));
-    }
-  }
-};
-
-template <> struct ScalarEnumerationTraits<CPUType> {
-  static void 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));
-    }
-  }
-};
-
-template <> struct ScalarEnumerationTraits<RegisterId> {
-  static void 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));
-    }
-  }
-};
-
-template <> struct ScalarEnumerationTraits<TrampolineType> {
-  static void 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));
-    }
-  }
-};
-
 template <> struct ScalarEnumerationTraits<ThunkOrdinal> {
-  static void 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 enumeration(IO &io, ThunkOrdinal Ord) {}
 };
 
 void MappingTraits<ScopeEndSym>::mapping(IO &IO, ScopeEndSym &Obj) {}
 
 void MappingTraits<Thunk32Sym>::mapping(IO &IO, Thunk32Sym &Thunk) {
-  IO.mapRequired("Parent", Thunk.Parent);
-  IO.mapRequired("End", Thunk.End);
-  IO.mapRequired("Next", Thunk.Next);
-  IO.mapRequired("Off", Thunk.Offset);
-  IO.mapRequired("Seg", Thunk.Segment);
-  IO.mapRequired("Len", Thunk.Length);
-  IO.mapRequired("Ordinal", Thunk.Thunk);
+  IO.mapRequired("Parent", Thunk.Header.Parent);
+  IO.mapRequired("End", Thunk.Header.End);
+  IO.mapRequired("Next", Thunk.Header.Next);
+  IO.mapRequired("Off", Thunk.Header.Off);
+  IO.mapRequired("Seg", Thunk.Header.Seg);
+  IO.mapRequired("Len", Thunk.Header.Len);
+  IO.mapRequired("Ordinal", Thunk.Header.Ord);
 }
 
 void MappingTraits<TrampolineSym>::mapping(IO &IO, TrampolineSym &Tramp) {
-  IO.mapRequired("Type", Tramp.Type);
-  IO.mapRequired("Size", Tramp.Size);
-  IO.mapRequired("ThunkOff", Tramp.ThunkOffset);
-  IO.mapRequired("TargetOff", Tramp.TargetOffset);
-  IO.mapRequired("ThunkSection", Tramp.ThunkSection);
-  IO.mapRequired("TargetSection", Tramp.TargetSection);
+  IO.mapRequired("Type", Tramp.Header.Type);
+  IO.mapRequired("Size", Tramp.Header.Size);
+  IO.mapRequired("ThunkOff", Tramp.Header.ThunkOff);
+  IO.mapRequired("TargetOff", Tramp.Header.TargetOff);
+  IO.mapRequired("ThunkSection", Tramp.Header.ThunkSection);
+  IO.mapRequired("TargetSection", Tramp.Header.TargetSection);
 }
 
 void MappingTraits<SectionSym>::mapping(IO &IO, SectionSym &Section) {
-  IO.mapRequired("SectionNumber", Section.SectionNumber);
-  IO.mapRequired("Alignment", Section.Alignment);
-  IO.mapRequired("Rva", Section.Rva);
-  IO.mapRequired("Length", Section.Length);
-  IO.mapRequired("Characteristics", Section.Characteristics);
+  IO.mapRequired("SectionNumber", Section.Header.SectionNumber);
+  IO.mapRequired("Alignment", Section.Header.Alignment);
+  IO.mapRequired("Reserved", Section.Header.Reserved);
+  IO.mapRequired("Rva", Section.Header.Rva);
+  IO.mapRequired("Length", Section.Header.Length);
+  IO.mapRequired("Characteristics", Section.Header.Characteristics);
   IO.mapRequired("Name", Section.Name);
 }
 
 void MappingTraits<CoffGroupSym>::mapping(IO &IO, CoffGroupSym &CoffGroup) {
-  IO.mapRequired("Size", CoffGroup.Size);
-  IO.mapRequired("Characteristics", CoffGroup.Characteristics);
-  IO.mapRequired("Offset", CoffGroup.Offset);
-  IO.mapRequired("Segment", CoffGroup.Segment);
+  IO.mapRequired("Size", CoffGroup.Header.Size);
+  IO.mapRequired("Characteristics", CoffGroup.Header.Characteristics);
+  IO.mapRequired("Offset", CoffGroup.Header.Offset);
+  IO.mapRequired("Segment", CoffGroup.Header.Segment);
   IO.mapRequired("Name", CoffGroup.Name);
 }
 
 void MappingTraits<ExportSym>::mapping(IO &IO, ExportSym &Export) {
-  IO.mapRequired("Ordinal", Export.Ordinal);
-  IO.mapRequired("Flags", Export.Flags);
+  IO.mapRequired("Ordinal", Export.Header.Ordinal);
+  IO.mapRequired("Flags", Export.Header.Flags);
   IO.mapRequired("Name", Export.Name);
 }
 
 void MappingTraits<ProcSym>::mapping(IO &IO, ProcSym &Proc) {
   // TODO: Print the linkage name
 
-  IO.mapRequired("PtrParent", Proc.Parent);
-  IO.mapRequired("PtrEnd", Proc.End);
-  IO.mapRequired("PtrNext", Proc.Next);
-  IO.mapRequired("CodeSize", Proc.CodeSize);
-  IO.mapRequired("DbgStart", Proc.DbgStart);
-  IO.mapRequired("DbgEnd", Proc.DbgEnd);
-  IO.mapRequired("FunctionType", Proc.FunctionType);
-  IO.mapRequired("Segment", Proc.Segment);
-  IO.mapRequired("Flags", Proc.Flags);
+  IO.mapRequired("PtrParent", Proc.Header.PtrParent);
+  IO.mapRequired("PtrEnd", Proc.Header.PtrEnd);
+  IO.mapRequired("PtrNext", Proc.Header.PtrNext);
+  IO.mapRequired("CodeSize", Proc.Header.CodeSize);
+  IO.mapRequired("DbgStart", Proc.Header.DbgStart);
+  IO.mapRequired("DbgEnd", Proc.Header.DbgEnd);
+  IO.mapRequired("FunctionType", Proc.Header.FunctionType);
+  IO.mapRequired("Segment", Proc.Header.Segment);
+  IO.mapRequired("Flags", Proc.Header.Flags);
   IO.mapRequired("DisplayName", Proc.Name);
 }
 
 void MappingTraits<RegisterSym>::mapping(IO &IO, RegisterSym &Register) {
-  IO.mapRequired("Type", Register.Index);
-  IO.mapRequired("Seg", Register.Register);
+  IO.mapRequired("Type", Register.Header.Index);
+  IO.mapRequired("Seg", Register.Header.Register);
   IO.mapRequired("Name", Register.Name);
 }
 
 void MappingTraits<PublicSym32>::mapping(IO &IO, PublicSym32 &Public) {
-  IO.mapRequired("Type", Public.Index);
-  IO.mapRequired("Seg", Public.Segment);
-  IO.mapRequired("Off", Public.Offset);
+  IO.mapRequired("Type", Public.Header.Index);
+  IO.mapRequired("Seg", Public.Header.Seg);
+  IO.mapRequired("Off", Public.Header.Off);
   IO.mapRequired("Name", Public.Name);
 }
 
 void MappingTraits<ProcRefSym>::mapping(IO &IO, ProcRefSym &ProcRef) {
-  IO.mapRequired("SumName", ProcRef.SumName);
-  IO.mapRequired("SymOffset", ProcRef.SymOffset);
-  IO.mapRequired("Mod", ProcRef.Module);
+  IO.mapRequired("SumName", ProcRef.Header.SumName);
+  IO.mapRequired("SymOffset", ProcRef.Header.SymOffset);
+  IO.mapRequired("Mod", ProcRef.Header.Mod);
   IO.mapRequired("Name", ProcRef.Name);
 }
 
 void MappingTraits<EnvBlockSym>::mapping(IO &IO, EnvBlockSym &EnvBlock) {
+  IO.mapRequired("Reserved", EnvBlock.Header.Reserved);
   IO.mapRequired("Entries", EnvBlock.Fields);
 }
 
 void MappingTraits<InlineSiteSym>::mapping(IO &IO, InlineSiteSym &InlineSite) {
-  IO.mapRequired("PtrParent", InlineSite.Parent);
-  IO.mapRequired("PtrEnd", InlineSite.End);
-  IO.mapRequired("Inlinee", InlineSite.Inlinee);
+  IO.mapRequired("PtrParent", InlineSite.Header.PtrParent);
+  IO.mapRequired("PtrEnd", InlineSite.Header.PtrEnd);
+  IO.mapRequired("Inlinee", InlineSite.Header.Inlinee);
   // TODO: The binary annotations
 }
 
 void MappingTraits<LocalSym>::mapping(IO &IO, LocalSym &Local) {
-  IO.mapRequired("Type", Local.Type);
-  IO.mapRequired("Flags", Local.Flags);
+  IO.mapRequired("Type", Local.Header.Type);
+  IO.mapRequired("Flags", Local.Header.Flags);
   IO.mapRequired("VarName", Local.Name);
 }
 
@@ -268,93 +176,95 @@ void MappingTraits<DefRangeRegisterRelSym>::mapping(
 
 void MappingTraits<BlockSym>::mapping(IO &IO, BlockSym &Block) {
   // TODO: Print the linkage name
-  IO.mapRequired("PtrParent", Block.Parent);
-  IO.mapRequired("PtrEnd", Block.End);
-  IO.mapRequired("CodeSize", Block.CodeSize);
-  IO.mapRequired("Segment", Block.Segment);
+  IO.mapRequired("PtrParent", Block.Header.PtrParent);
+  IO.mapRequired("PtrEnd", Block.Header.PtrEnd);
+  IO.mapRequired("CodeSize", Block.Header.CodeSize);
+  IO.mapRequired("Segment", Block.Header.Segment);
   IO.mapRequired("BlockName", Block.Name);
 }
 
 void MappingTraits<LabelSym>::mapping(IO &IO, LabelSym &Label) {
   // TODO: Print the linkage name
-  IO.mapRequired("Segment", Label.Segment);
-  IO.mapRequired("Flags", Label.Flags);
-  IO.mapRequired("Flags", Label.Flags);
+  IO.mapRequired("Segment", Label.Header.Segment);
+  IO.mapRequired("Flags", Label.Header.Flags);
+  IO.mapRequired("Flags", Label.Header.Flags);
   IO.mapRequired("DisplayName", Label.Name);
 }
 
 void MappingTraits<ObjNameSym>::mapping(IO &IO, ObjNameSym &ObjName) {
-  IO.mapRequired("Signature", ObjName.Signature);
+  IO.mapRequired("Signature", ObjName.Header.Signature);
   IO.mapRequired("ObjectName", ObjName.Name);
 }
 
 void MappingTraits<Compile2Sym>::mapping(IO &IO, Compile2Sym &Compile2) {
-  IO.mapRequired("Flags", Compile2.Flags);
-  IO.mapRequired("Machine", Compile2.Machine);
-  IO.mapRequired("FrontendMajor", Compile2.VersionFrontendMajor);
-  IO.mapRequired("FrontendMinor", Compile2.VersionFrontendMinor);
-  IO.mapRequired("FrontendBuild", Compile2.VersionFrontendBuild);
-  IO.mapRequired("BackendMajor", Compile2.VersionBackendMajor);
-  IO.mapRequired("BackendMinor", Compile2.VersionBackendMinor);
-  IO.mapRequired("BackendBuild", Compile2.VersionBackendBuild);
+  IO.mapRequired("Flags", Compile2.Header.flags);
+  IO.mapRequired("Machine", Compile2.Header.Machine);
+  IO.mapRequired("FrontendMajor", Compile2.Header.VersionFrontendMajor);
+  IO.mapRequired("FrontendMinor", Compile2.Header.VersionFrontendMinor);
+  IO.mapRequired("FrontendBuild", Compile2.Header.VersionFrontendBuild);
+  IO.mapRequired("BackendMajor", Compile2.Header.VersionBackendMajor);
+  IO.mapRequired("BackendMinor", Compile2.Header.VersionBackendMinor);
+  IO.mapRequired("BackendBuild", Compile2.Header.VersionBackendBuild);
   IO.mapRequired("Version", Compile2.Version);
 }
 
 void MappingTraits<Compile3Sym>::mapping(IO &IO, Compile3Sym &Compile3) {
-  IO.mapRequired("Flags", Compile3.Flags);
-  IO.mapRequired("Machine", Compile3.Machine);
-  IO.mapRequired("FrontendMajor", Compile3.VersionFrontendMajor);
-  IO.mapRequired("FrontendMinor", Compile3.VersionFrontendMinor);
-  IO.mapRequired("FrontendBuild", Compile3.VersionFrontendBuild);
-  IO.mapRequired("FrontendQFE", Compile3.VersionFrontendQFE);
-  IO.mapRequired("BackendMajor", Compile3.VersionBackendMajor);
-  IO.mapRequired("BackendMinor", Compile3.VersionBackendMinor);
-  IO.mapRequired("BackendBuild", Compile3.VersionBackendBuild);
-  IO.mapRequired("BackendQFE", Compile3.VersionBackendQFE);
+  IO.mapRequired("Flags", Compile3.Header.flags);
+  IO.mapRequired("Machine", Compile3.Header.Machine);
+  IO.mapRequired("FrontendMajor", Compile3.Header.VersionFrontendMajor);
+  IO.mapRequired("FrontendMinor", Compile3.Header.VersionFrontendMinor);
+  IO.mapRequired("FrontendBuild", Compile3.Header.VersionFrontendBuild);
+  IO.mapRequired("FrontendQFE", Compile3.Header.VersionFrontendQFE);
+  IO.mapRequired("BackendMajor", Compile3.Header.VersionBackendMajor);
+  IO.mapRequired("BackendMinor", Compile3.Header.VersionBackendMinor);
+  IO.mapRequired("BackendBuild", Compile3.Header.VersionBackendBuild);
+  IO.mapRequired("BackendQFE", Compile3.Header.VersionBackendQFE);
   IO.mapRequired("Version", Compile3.Version);
 }
 
 void MappingTraits<FrameProcSym>::mapping(IO &IO, FrameProcSym &FrameProc) {
-  IO.mapRequired("TotalFrameBytes", FrameProc.TotalFrameBytes);
-  IO.mapRequired("PaddingFrameBytes", FrameProc.PaddingFrameBytes);
-  IO.mapRequired("OffsetToPadding", FrameProc.OffsetToPadding);
+  IO.mapRequired("TotalFrameBytes", FrameProc.Header.TotalFrameBytes);
+  IO.mapRequired("PaddingFrameBytes", FrameProc.Header.PaddingFrameBytes);
+  IO.mapRequired("OffsetToPadding", FrameProc.Header.OffsetToPadding);
   IO.mapRequired("BytesOfCalleeSavedRegisters",
-                 FrameProc.BytesOfCalleeSavedRegisters);
+                 FrameProc.Header.BytesOfCalleeSavedRegisters);
   IO.mapRequired("OffsetOfExceptionHandler",
-                 FrameProc.OffsetOfExceptionHandler);
+                 FrameProc.Header.OffsetOfExceptionHandler);
   IO.mapRequired("SectionIdOfExceptionHandler",
-                 FrameProc.SectionIdOfExceptionHandler);
-  IO.mapRequired("Flags", FrameProc.Flags);
+                 FrameProc.Header.SectionIdOfExceptionHandler);
+  IO.mapRequired("Flags", FrameProc.Header.Flags);
 }
 
 void MappingTraits<CallSiteInfoSym>::mapping(IO &IO,
                                              CallSiteInfoSym &CallSiteInfo) {
   // TODO: Map Linkage Name
-  IO.mapRequired("Segment", CallSiteInfo.Segment);
-  IO.mapRequired("Type", CallSiteInfo.Type);
+  IO.mapRequired("Segment", CallSiteInfo.Header.Segment);
+  IO.mapRequired("Reserved", CallSiteInfo.Header.Reserved);
+  IO.mapRequired("Type", CallSiteInfo.Header.Type);
 }
 
 void MappingTraits<FileStaticSym>::mapping(IO &IO, FileStaticSym &FileStatic) {
-  IO.mapRequired("Index", FileStatic.Index);
-  IO.mapRequired("ModFilenameOffset", FileStatic.ModFilenameOffset);
-  IO.mapRequired("Flags", FileStatic.Flags);
+  IO.mapRequired("Index", FileStatic.Header.Index);
+  IO.mapRequired("ModFilenameOffset", FileStatic.Header.ModFilenameOffset);
+  IO.mapRequired("Flags", FileStatic.Header.Flags);
   IO.mapRequired("Name", FileStatic.Name);
 }
 
 void MappingTraits<HeapAllocationSiteSym>::mapping(
     IO &IO, HeapAllocationSiteSym &HeapAllocSite) {
   // TODO: Map Linkage Name
-  IO.mapRequired("Segment", HeapAllocSite.Segment);
-  IO.mapRequired("CallInstructionSize", HeapAllocSite.CallInstructionSize);
-  IO.mapRequired("Type", HeapAllocSite.Type);
+  IO.mapRequired("Segment", HeapAllocSite.Header.Segment);
+  IO.mapRequired("CallInstructionSize",
+                 HeapAllocSite.Header.CallInstructionSize);
+  IO.mapRequired("Type", HeapAllocSite.Header.Type);
 }
 
 void MappingTraits<FrameCookieSym>::mapping(IO &IO,
                                             FrameCookieSym &FrameCookie) {
   // TODO: Map Linkage Name
-  IO.mapRequired("Register", FrameCookie.Register);
-  IO.mapRequired("CookieKind", FrameCookie.CookieKind);
-  IO.mapRequired("Flags", FrameCookie.Flags);
+  IO.mapRequired("Register", FrameCookie.Header.Register);
+  IO.mapRequired("CookieKind", FrameCookie.Header.CookieKind);
+  IO.mapRequired("Flags", FrameCookie.Header.Flags);
 }
 
 void MappingTraits<CallerSym>::mapping(IO &IO, CallerSym &Caller) {
@@ -364,43 +274,43 @@ void MappingTraits<CallerSym>::mapping(IO &IO, CallerSym &Caller) {
 }
 
 void MappingTraits<UDTSym>::mapping(IO &IO, UDTSym &UDT) {
-  IO.mapRequired("Type", UDT.Type);
+  IO.mapRequired("Type", UDT.Header.Type);
   IO.mapRequired("UDTName", UDT.Name);
 }
 
 void MappingTraits<BuildInfoSym>::mapping(IO &IO, BuildInfoSym &BuildInfo) {
-  IO.mapRequired("BuildId", BuildInfo.BuildId);
+  IO.mapRequired("BuildId", BuildInfo.Header.BuildId);
 }
 
 void MappingTraits<BPRelativeSym>::mapping(IO &IO, BPRelativeSym &BPRel) {
-  IO.mapRequired("Offset", BPRel.Offset);
-  IO.mapRequired("Type", BPRel.Type);
+  IO.mapRequired("Offset", BPRel.Header.Offset);
+  IO.mapRequired("Type", BPRel.Header.Type);
   IO.mapRequired("VarName", BPRel.Name);
 }
 
 void MappingTraits<RegRelativeSym>::mapping(IO &IO, RegRelativeSym &RegRel) {
-  IO.mapRequired("Offset", RegRel.Offset);
-  IO.mapRequired("Type", RegRel.Type);
-  IO.mapRequired("Register", RegRel.Register);
+  IO.mapRequired("Offset", RegRel.Header.Offset);
+  IO.mapRequired("Type", RegRel.Header.Type);
+  IO.mapRequired("Register", RegRel.Header.Register);
   IO.mapRequired("VarName", RegRel.Name);
 }
 
 void MappingTraits<ConstantSym>::mapping(IO &IO, ConstantSym &Constant) {
-  IO.mapRequired("Type", Constant.Type);
+  IO.mapRequired("Type", Constant.Header.Type);
   IO.mapRequired("Value", Constant.Value);
   IO.mapRequired("Name", Constant.Name);
 }
 
 void MappingTraits<DataSym>::mapping(IO &IO, DataSym &Data) {
   // TODO: Map linkage name
-  IO.mapRequired("Type", Data.Type);
+  IO.mapRequired("Type", Data.Header.Type);
   IO.mapRequired("DisplayName", Data.Name);
 }
 
 void MappingTraits<ThreadLocalDataSym>::mapping(IO &IO,
                                                 ThreadLocalDataSym &Data) {
   // TODO: Map linkage name
-  IO.mapRequired("Type", Data.Type);
+  IO.mapRequired("Type", Data.Header.Type);
   IO.mapRequired("DisplayName", Data.Name);
 }
 }