diff options
author | Frederic Riss <friss@apple.com> | 2015-06-03 17:08:42 +0000 |
---|---|---|
committer | Frederic Riss <friss@apple.com> | 2015-06-03 17:08:42 +0000 |
commit | 57c68eeefe368a0da326af988714cfa203351c41 (patch) | |
tree | 22370130a9a49159cd147f654750b6d01ba6a1b8 /tools/dsymutil/DebugMap.h | |
parent | 001b032fea2f75e59b1b1ed7024e62e6672b3423 (diff) |
Revert "[dsymutil] Accept a YAML debug map as input instead of a binary."
This reverts commit r238941 while I figure out the bot issues.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238943 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/dsymutil/DebugMap.h')
-rw-r--r-- | tools/dsymutil/DebugMap.h | 50 |
1 files changed, 19 insertions, 31 deletions
diff --git a/tools/dsymutil/DebugMap.h b/tools/dsymutil/DebugMap.h index c2917db981e..8d76f113e91 100644 --- a/tools/dsymutil/DebugMap.h +++ b/tools/dsymutil/DebugMap.h @@ -69,7 +69,6 @@ class DebugMap { /// For YAML IO support. ///@{ - friend yaml::MappingTraits<std::unique_ptr<DebugMap>>; friend yaml::MappingTraits<DebugMap>; DebugMap() = default; ///@} @@ -185,35 +184,33 @@ struct MappingTraits<std::pair<std::string, DebugMapObject::SymbolMapping>> { }; template <> struct MappingTraits<dsymutil::DebugMapObject> { - // Normalize/Denormalize between YAML and a DebugMapObject. - struct YamlDMO { - YamlDMO(IO &io) {} - - YamlDMO(IO &io, dsymutil::DebugMapObject &Obj) { - Filename = Obj.Filename; - Entries.reserve(Obj.Symbols.size()); - for (auto &Entry : Obj.Symbols) + typedef StringMap<dsymutil::DebugMapObject::SymbolMapping> SymbolMap; + + struct SequencedStringMap { + SequencedStringMap(IO &io) {} + + SequencedStringMap(IO &io, SymbolMap &Map) { + Entries.reserve(Map.size()); + for (auto &Entry : Map) Entries.push_back(std::make_pair(Entry.getKey(), Entry.getValue())); } - dsymutil::DebugMapObject denormalize(IO &) { - dsymutil::DebugMapObject Res(Filename); - for (auto &Entry : Entries) { - auto &Mapping = Entry.second; - Res.addSymbol(Entry.first, Mapping.ObjectAddress, Mapping.BinaryAddress, - Mapping.Size); - } + SymbolMap denormalize(IO &) { + SymbolMap Res; + + for (auto &Entry : Entries) + Res[Entry.first] = Entry.second; + return Res; } - std::string Filename; std::vector<dsymutil::DebugMapObject::YAMLSymbolMapping> Entries; }; - static void mapping(IO &io, dsymutil::DebugMapObject &DMO) { - MappingNormalization<YamlDMO, dsymutil::DebugMapObject> Norm(io, DMO); - io.mapRequired("filename", Norm->Filename); - io.mapRequired("symbols", Norm->Entries); + static void mapping(IO &io, dsymutil::DebugMapObject &s) { + MappingNormalization<SequencedStringMap, SymbolMap> seq(io, s.Symbols); + io.mapRequired("filename", s.Filename); + io.mapRequired("symbols", seq->Entries); } }; @@ -225,7 +222,7 @@ template <> struct ScalarTraits<Triple> { static StringRef input(StringRef scalar, void *, Triple &value) { value = Triple(scalar); - return StringRef(); + return value.str(); } static bool mustQuote(StringRef) { return true; } @@ -256,15 +253,6 @@ template <> struct MappingTraits<dsymutil::DebugMap> { io.mapOptional("objects", DM.Objects); } }; - - template <> struct MappingTraits<std::unique_ptr<dsymutil::DebugMap>> { - static void mapping(IO &io, std::unique_ptr<dsymutil::DebugMap> &DM) { - if (!DM) - DM.reset(new DebugMap()); - io.mapRequired("triple", DM->BinaryTriple); - io.mapOptional("objects", DM->Objects); - } -}; } } |