RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[llvm-tapi-diff] Apply stable sorting to output"

Browse Source 
This reverts commit 90a26a41e9ce16a4d471d25c2f7b36b5538fb4ce.
This failed to fix ubuntu failures.
This commit is contained in:
Cyndy Ishida 2021-06-09 13:45:13 -07:00
parent 10d0bfc79e
commit 69fb005298
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/llvm-tapi-diff/DiffEngine.cpp
View File

@ -439,15 +439,6 @@ T *castValues(const std::unique_ptr<AttributeDiff> &RawAttr) {
return CastAttr; return CastAttr;
} }
template <typename T> void sortTargetValues(std::vector<T> &TargValues) {
llvm::sort(TargValues, [](const auto &ValA, const auto &ValB) {
return ValA.getOrder() < ValB.getOrder();
});
llvm::sort(TargValues, [](const auto &ValA, const auto &ValB) {
return ValA.getOrder() == ValB.getOrder() && ValA.getVal() < ValB.getVal();
});
}
template <typename T> template <typename T>
void printVecVal(std::string Indent, const DiffOutput &Attr, raw_ostream &OS) { void printVecVal(std::string Indent, const DiffOutput &Attr, raw_ostream &OS) {
if (Attr.Values.empty()) if (Attr.Values.empty())
@ -464,8 +455,10 @@ void printVecVal(std::string Indent, const DiffOutput &Attr, raw_ostream &OS) {
}); });
for (auto *Vec : SortedAttrs) { for (auto *Vec : SortedAttrs) {
sortTargetValues<DiffScalarVal<StringRef, AD_Diff_Scalar_Str>>( llvm::sort(Vec->TargValues, [](const auto &ValA, const auto &ValB) {
Vec->TargValues); return ValA.getOrder() == ValB.getOrder() &&
ValA.getVal() < ValB.getVal();
});
OS << Indent << "\t" << getTargetTripleName(Vec->Targ) << "\n"; OS << Indent << "\t" << getTargetTripleName(Vec->Targ) << "\n";
for (auto &Item : Vec->TargValues) for (auto &Item : Vec->TargValues)
Item.print(OS, Indent); Item.print(OS, Indent);
@ -489,7 +482,10 @@ void printVecVal<DiffSymVec>(std::string Indent, const DiffOutput &Attr,
return ValA->Targ < ValB->Targ; return ValA->Targ < ValB->Targ;
}); });
for (auto *SymVec : SortedAttrs) { for (auto *SymVec : SortedAttrs) {
sortTargetValues<SymScalar>(SymVec->TargValues); llvm::sort(SymVec->TargValues, [](const auto &ValA, const auto &ValB) {
return ValA.getOrder() == ValB.getOrder() &&
ValA.getVal() < ValB.getVal();
});
OS << Indent << "\t" << getTargetTripleName(SymVec->Targ) << "\n"; OS << Indent << "\t" << getTargetTripleName(SymVec->Targ) << "\n";
for (auto &Item : SymVec->TargValues) for (auto &Item : SymVec->TargValues)
Item.print(OS, Indent, SymVec->Targ); Item.print(OS, Indent, SymVec->Targ);