projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dsymutil] Discard useless location attributes.
[oota-llvm.git]
/
tools
/
dsymutil
/
DebugMap.cpp
diff --git
a/tools/dsymutil/DebugMap.cpp
b/tools/dsymutil/DebugMap.cpp
index e29c885b5ac0248afaa5780e62493a2822a65c7b..4717085f43227716ba26d60813fe486f3e3a4fe8 100644
(file)
--- a/
tools/dsymutil/DebugMap.cpp
+++ b/
tools/dsymutil/DebugMap.cpp
@@
-97,7
+97,7
@@
struct YAMLContext {
};
}
};
}
-ErrorOr<std::
unique_ptr<DebugMap
>>
+ErrorOr<std::
vector<std::unique_ptr<DebugMap>
>>
DebugMap::parseYAMLDebugMap(StringRef InputFile, StringRef PrependPath,
bool Verbose) {
auto ErrOrFile = MemoryBuffer::getFileOrSTDIN(InputFile);
DebugMap::parseYAMLDebugMap(StringRef InputFile, StringRef PrependPath,
bool Verbose) {
auto ErrOrFile = MemoryBuffer::getFileOrSTDIN(InputFile);
@@
-114,8
+114,9
@@
DebugMap::parseYAMLDebugMap(StringRef InputFile, StringRef PrependPath,
if (auto EC = yin.error())
return EC;
if (auto EC = yin.error())
return EC;
-
- return std::move(Res);
+ std::vector<std::unique_ptr<DebugMap>> Result;
+ Result.push_back(std::move(Res));
+ return std::move(Result);
}
}
}
}
@@
-178,6
+179,7
@@
SequenceTraits<std::vector<std::unique_ptr<dsymutil::DebugMapObject>>>::element(
void MappingTraits<dsymutil::DebugMap>::mapping(IO &io,
dsymutil::DebugMap &DM) {
io.mapRequired("triple", DM.BinaryTriple);
void MappingTraits<dsymutil::DebugMap>::mapping(IO &io,
dsymutil::DebugMap &DM) {
io.mapRequired("triple", DM.BinaryTriple);
+ io.mapOptional("binary-path", DM.BinaryPath);
if (void *Ctxt = io.getContext())
reinterpret_cast<YAMLContext *>(Ctxt)->BinaryTriple = DM.BinaryTriple;
io.mapOptional("objects", DM.Objects);
if (void *Ctxt = io.getContext())
reinterpret_cast<YAMLContext *>(Ctxt)->BinaryTriple = DM.BinaryTriple;
io.mapOptional("objects", DM.Objects);
@@
-188,6
+190,7
@@
void MappingTraits<std::unique_ptr<dsymutil::DebugMap>>::mapping(
if (!DM)
DM.reset(new DebugMap());
io.mapRequired("triple", DM->BinaryTriple);
if (!DM)
DM.reset(new DebugMap());
io.mapRequired("triple", DM->BinaryTriple);
+ io.mapOptional("binary-path", DM->BinaryPath);
if (void *Ctxt = io.getContext())
reinterpret_cast<YAMLContext *>(Ctxt)->BinaryTriple = DM->BinaryTriple;
io.mapOptional("objects", DM->Objects);
if (void *Ctxt = io.getContext())
reinterpret_cast<YAMLContext *>(Ctxt)->BinaryTriple = DM->BinaryTriple;
io.mapOptional("objects", DM->Objects);