From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Mon, 13 Jul 2015 22:01:02 +0000 (+0000)
Subject: Use std::make_tuple to reduce code duplication.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6d0b72637cfdd3a1e07bf4a05a788a760d0f67ef;p=oota-llvm.git

Use std::make_tuple to reduce code duplication.

Thanks to David Blaikie for the suggestion.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@242074 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp
index 80f166da399..e7ee3124ed7 100644
--- a/tools/llvm-nm/llvm-nm.cpp
+++ b/tools/llvm-nm/llvm-nm.cpp
@@ -185,39 +185,20 @@ struct NMSymbol {
 }
 
 static bool compareSymbolAddress(const NMSymbol &A, const NMSymbol &B) {
-  bool AUndefined = A.Sym.getFlags() & SymbolRef::SF_Undefined;
-  bool BUndefined = B.Sym.getFlags() & SymbolRef::SF_Undefined;
-  if (AUndefined && !BUndefined)
-    return true;
-  if (!AUndefined && BUndefined)
-    return false;
-  if (A.Address < B.Address)
-    return true;
-  if (A.Address == B.Address && A.Name < B.Name)
-    return true;
-  if (A.Address == B.Address && A.Name == B.Name && A.Size < B.Size)
-    return true;
-  return false;
+  bool ADefined = !(A.Sym.getFlags() & SymbolRef::SF_Undefined);
+  bool BDefined = !(B.Sym.getFlags() & SymbolRef::SF_Undefined);
+  return std::make_tuple(ADefined, A.Address, A.Name, A.Size) <
+         std::make_tuple(BDefined, B.Address, B.Name, B.Size);
 }
 
 static bool compareSymbolSize(const NMSymbol &A, const NMSymbol &B) {
-  if (A.Size < B.Size)
-    return true;
-  if (A.Size == B.Size && A.Name < B.Name)
-    return true;
-  if (A.Size == B.Size && A.Name == B.Name && A.Address < B.Address)
-    return true;
-  return false;
+  return std::make_tuple(A.Size, A.Name, A.Address) <
+         std::make_tuple(B.Size, B.Name, B.Address);
 }
 
 static bool compareSymbolName(const NMSymbol &A, const NMSymbol &B) {
-  if (A.Name < B.Name)
-    return true;
-  if (A.Name == B.Name && A.Size < B.Size)
-    return true;
-  if (A.Name == B.Name && A.Size == B.Size && A.Address < B.Address)
-    return true;
-  return false;
+  return std::make_tuple(A.Name, A.Size, A.Address) <
+         std::make_tuple(B.Name, B.Size, B.Address);
 }
 
 static char isSymbolList64Bit(SymbolicFile &Obj) {