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

[Cyndy Ishida via llvm-commits]

Author: Cyndy Ishida
Date: 2021-06-09T13:48:09-07:00
New Revision: 1899cb7d0eae74cc700d44e1f220a7ce41395ce0

URL: https://github.com/llvm/llvm-project/commit/1899cb7d0eae74cc700d44e1f220a7ce41395ce0
DIFF: https://github.com/llvm/llvm-project/commit/1899cb7d0eae74cc700d44e1f220a7ce41395ce0.diff

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

This reverts commit 90a26a41e9ce16a4d471d25c2f7b36b5538fb4ce.
This failed to fix ubuntu failures.

Added: 
    

Modified: 
    llvm/tools/llvm-tapi-diff/DiffEngine.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/tools/llvm-tapi-
diff /DiffEngine.cpp b/llvm/tools/llvm-tapi-
diff /DiffEngine.cpp
index 837ddb42bb25..bc9ee626d8fc 100644
--- a/llvm/tools/llvm-tapi-
diff /DiffEngine.cpp
+++ b/llvm/tools/llvm-tapi-
diff /DiffEngine.cpp
@@ -439,15 +439,6 @@ T *castValues(const std::unique_ptr<AttributeDiff> &RawAttr) {
   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>
 void printVecVal(std::string Indent, const DiffOutput &Attr, raw_ostream &OS) {
   if (Attr.Values.empty())
@@ -464,8 +455,10 @@ void printVecVal(std::string Indent, const DiffOutput &Attr, raw_ostream &OS) {
   });
 
   for (auto *Vec : SortedAttrs) {
-    sortTargetValues<DiffScalarVal<StringRef, AD_Diff_Scalar_Str>>(
-        Vec->TargValues);
+    llvm::sort(Vec->TargValues, [](const auto &ValA, const auto &ValB) {
+      return ValA.getOrder() == ValB.getOrder() &&
+             ValA.getVal() < ValB.getVal();
+    });
     OS << Indent << "\t" << getTargetTripleName(Vec->Targ) << "\n";
     for (auto &Item : Vec->TargValues)
       Item.print(OS, Indent);
@@ -489,7 +482,10 @@ void printVecVal<DiffSymVec>(std::string Indent, const DiffOutput &Attr,
     return ValA->Targ < ValB->Targ;
   });
   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";
     for (auto &Item : SymVec->TargValues)
       Item.print(OS, Indent, SymVec->Targ);