Refactor: Simplify boolean expressions in llvm-nm

[LegalizeAdulthood]

Summary

Simplify boolean expressions using true and false with clang-tidy

[LegalizeAdulthood]

In article <[e-mail]>,

David Blaikie <[e-mail]> writes:

If we changed the code to:

if (x)

return true;

return false;

would it still trigger the cleanup check you're using?

Nope.

The tool explicitly looks for 'if (e) return true; else return false;'
and replaces that with 'return e;'

[LegalizeAdulthood]

I'm discarding this because a variation of it has been incorporated into trunk.

tools/llvm-nm/llvm-nm.cpp

 }
 
 static bool compareSymbolAddress(const NMSymbol &A, const NMSymbol &B) {
   if (!ReverseSort) {
     if (A.Address < B.Address)
       return true;
     else if (A.Address == B.Address && A.Name < B.Name)
       return true;
-    else if (A.Address == B.Address && A.Name == B.Name && A.Size < B.Size)
-      return true;
     else
-      return false;
+      return A.Address == B.Address && A.Name == B.Name && A.Size < B.Size;
   } else {
     if (A.Address > B.Address)
       return true;
     else if (A.Address == B.Address && A.Name > B.Name)
       return true;
-    else if (A.Address == B.Address && A.Name == B.Name && A.Size > B.Size)
-      return true;
     else
-      return false;
+      return A.Address == B.Address && A.Name == B.Name && A.Size > B.Size;
   }
 }
 
 static bool compareSymbolSize(const NMSymbol &A, const NMSymbol &B) {
   if (!ReverseSort) {
     if (A.Size < B.Size)
       return true;
     else if (A.Size == B.Size && A.Name < B.Name)
       return true;
-    else if (A.Size == B.Size && A.Name == B.Name && A.Address < B.Address)
-      return true;
     else
-      return false;
+      return A.Size == B.Size && A.Name == B.Name && A.Address < B.Address;
   } else {
     if (A.Size > B.Size)
       return true;
     else if (A.Size == B.Size && A.Name > B.Name)
       return true;
-    else if (A.Size == B.Size && A.Name == B.Name && A.Address > B.Address)
-      return true;
     else
-      return false;
+      return A.Size == B.Size && A.Name == B.Name && A.Address > B.Address;
   }
 }
 
 static bool compareSymbolName(const NMSymbol &A, const NMSymbol &B) {
   if (!ReverseSort) {
     if (A.Name < B.Name)
       return true;
     else if (A.Name == B.Name && A.Size < B.Size)
       return true;
-    else if (A.Name == B.Name && A.Size == B.Size && A.Address < B.Address)
-      return true;
     else
-      return false;
+      return A.Name == B.Name && A.Size == B.Size && A.Address < B.Address;
   } else {
     if (A.Name > B.Name)
       return true;
     else if (A.Name == B.Name && A.Size > B.Size)
       return true;
-    else if (A.Name == B.Name && A.Size == B.Size && A.Address > B.Address)
-      return true;
     else
-      return false;
+      return A.Name == B.Name && A.Size == B.Size && A.Address > B.Address;
   }
 }
 
 static char isSymbolList64Bit(SymbolicFile &Obj) {
   if (isa<IRObjectFile>(Obj))
     return false;
   else if (isa<COFFObjectFile>(Obj))
     return false;
   else if (MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(&Obj))
     return MachO->is64Bit();
   else if (isa<ELF32LEObjectFile>(Obj))
     return false;
   else if (isa<ELF64LEObjectFile>(Obj))
     return true;
   else if (isa<ELF32BEObjectFile>(Obj))
     return false;
-  else if (isa<ELF64BEObjectFile>(Obj))
-    return true;
   else
-    return false;
+    return isa<ELF64BEObjectFile>(Obj);
 }
 
 static StringRef CurrentFilename;
 typedef std::vector<NMSymbol> SymbolListT;
 static SymbolListT SymbolList;
 
 // darwinPrintSymbol() is used to print a symbol from a Mach-O file when the
 // the OutputFormat is darwin or we are printing Mach-O symbols in hex.  For