diff options
| -rw-r--r-- | llvm/tools/llvm-pdbdump/CodeViewYaml.cpp | 13 | ||||
| -rw-r--r-- | llvm/tools/llvm-pdbdump/CodeViewYaml.h | 14 |
2 files changed, 18 insertions, 9 deletions
diff --git a/llvm/tools/llvm-pdbdump/CodeViewYaml.cpp b/llvm/tools/llvm-pdbdump/CodeViewYaml.cpp index 4817c5963c1..fd6f1941766 100644 --- a/llvm/tools/llvm-pdbdump/CodeViewYaml.cpp +++ b/llvm/tools/llvm-pdbdump/CodeViewYaml.cpp @@ -269,29 +269,28 @@ template <> struct ScalarTraits<APSInt> { static bool mustQuote(StringRef Scalar) { return false; } }; -void MappingTraits<CVType>::mapping(IO &IO, CVType &Record) { +void MappingContextTraits<CVType, YamlTypeDumperCallbacks>::mapping( + IO &IO, CVType &Record, YamlTypeDumperCallbacks &Dumper) { if (IO.outputting()) { codeview::TypeDeserializer Deserializer; - codeview::yaml::YamlTypeDumperCallbacks Callbacks(IO); codeview::TypeVisitorCallbackPipeline Pipeline; Pipeline.addCallbackToPipeline(Deserializer); - Pipeline.addCallbackToPipeline(Callbacks); + Pipeline.addCallbackToPipeline(Dumper); codeview::CVTypeVisitor Visitor(Pipeline); consumeError(Visitor.visitTypeRecord(Record)); } } -void MappingTraits<FieldListRecord>::mapping(IO &IO, - FieldListRecord &FieldList) { +void MappingContextTraits<FieldListRecord, YamlTypeDumperCallbacks>::mapping( + IO &IO, FieldListRecord &FieldList, YamlTypeDumperCallbacks &Dumper) { if (IO.outputting()) { - codeview::yaml::YamlTypeDumperCallbacks Callbacks(IO); codeview::TypeDeserializer Deserializer; codeview::TypeVisitorCallbackPipeline Pipeline; Pipeline.addCallbackToPipeline(Deserializer); - Pipeline.addCallbackToPipeline(Callbacks); + Pipeline.addCallbackToPipeline(Dumper); codeview::CVTypeVisitor Visitor(Pipeline); consumeError(Visitor.visitFieldListMemberStream(FieldList.Data)); diff --git a/llvm/tools/llvm-pdbdump/CodeViewYaml.h b/llvm/tools/llvm-pdbdump/CodeViewYaml.h index ccf7e406b4f..d10ed619ad7 100644 --- a/llvm/tools/llvm-pdbdump/CodeViewYaml.h +++ b/llvm/tools/llvm-pdbdump/CodeViewYaml.h @@ -57,8 +57,11 @@ template <> struct MappingTraits<codeview::MemberPointerInfo> { static void mapping(IO &IO, codeview::MemberPointerInfo &Obj); }; -template <> struct MappingTraits<codeview::CVType> { - static void mapping(IO &IO, codeview::CVType &Obj); +template <> +struct MappingContextTraits<codeview::CVType, + codeview::yaml::YamlTypeDumperCallbacks> { + static void mapping(IO &IO, codeview::CVType &Obj, + codeview::yaml::YamlTypeDumperCallbacks &Context); }; template <> struct ScalarEnumerationTraits<codeview::TypeLeafKind> { @@ -74,6 +77,13 @@ template <> struct ScalarEnumerationTraits<codeview::TypeLeafKind> { #define TYPE_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName) #define MEMBER_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName) #include "llvm/DebugInfo/CodeView/TypeRecords.def" + +template <> +struct MappingContextTraits<codeview::FieldListRecord, + codeview::yaml::YamlTypeDumperCallbacks> { + static void mapping(IO &IO, codeview::FieldListRecord &Record, + codeview::yaml::YamlTypeDumperCallbacks &Context); +}; } } |
