Index: tools/llvm-nm/llvm-nm.cpp
===================================================================
--- tools/llvm-nm/llvm-nm.cpp
+++ tools/llvm-nm/llvm-nm.cpp
@@ -190,18 +190,14 @@
       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;
+    return A.Address == B.Address && A.Name == B.Name && A.Size < B.Size;
   }
 
   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;
+  return A.Address == B.Address && A.Name == B.Name && A.Size > B.Size;
 }
 
 static bool compareSymbolSize(const NMSymbol &A, const NMSymbol &B) {
@@ -210,18 +206,14 @@
       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 A.Size == B.Size && A.Name == B.Name && A.Address < B.Address;
   }
 
   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 A.Size == B.Size && A.Name == B.Name && A.Address > B.Address;
 }
 
 static bool compareSymbolName(const NMSymbol &A, const NMSymbol &B) {
@@ -230,17 +222,13 @@
       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 A.Name == B.Name && A.Size == B.Size && A.Address < B.Address;
   }
   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 A.Name == B.Name && A.Size == B.Size && A.Address > B.Address;
 }
 
 static char isSymbolList64Bit(SymbolicFile &Obj) {