This is an archive of the discontinued LLVM Phabricator instance.

Differential D10004

Refactor: Simplify boolean conditional return statements in tools/llvm-nm
AbandonedPublic

Authored by LegalizeAdulthood on May 25 2015, 11:52 AM.

Details

Reviewers
chandlerc
• rafael
Bigcheese
resistor
void
Summary

Use clang-tidy to simplify boolean conditional return statements

Diff Detail

Event Timeline

LegalizeAdulthood updated this revision to Diff 26469.May 25 2015, 11:52 AM
LegalizeAdulthood retitled this revision from to Refactor: Simplify boolean conditional return statements in tools/llvm-nm.
LegalizeAdulthood updated this object.
LegalizeAdulthood edited the test plan for this revision. (Show Details)
LegalizeAdulthood added reviewers: • rafael, Bigcheese, void, chandlerc, • ddunbar, resistor.
LegalizeAdulthood added a subscriber: Unknown Object (MLST).
• ddunbar resigned from this revision.May 25 2015, 1:23 PM
• ddunbar removed a reviewer: • ddunbar.
• rafael accepted this revision.May 26 2015, 6:52 AM
• rafael edited edge metadata.

LGTM

This revision is now accepted and ready to land.May 26 2015, 6:52 AM
LegalizeAdulthood abandoned this revision.Oct 24 2015, 11:29 AM

Revision Contents

PathSize
tools/
llvm-nm/
24 lines

Diff 26469

tools/llvm-nm/llvm-nm.cpp

Show First 20 Lines • Show All 184 Lines • ▼ Show 20 Lines
} }
static bool compareSymbolAddress(const NMSymbol &A, const NMSymbol &B) { static bool compareSymbolAddress(const NMSymbol &A, const NMSymbol &B) {
if (!ReverseSort) { if (!ReverseSort) {
if (A.Address < B.Address) if (A.Address < B.Address)
return true; return true;
if (A.Address == B.Address && A.Name < B.Name) if (A.Address == B.Address && A.Name < B.Name)
return true; return true;
if (A.Address == B.Address && A.Name == B.Name && A.Size < B.Size) return A.Address == B.Address && A.Name == B.Name && A.Size < B.Size;
return true;
return false;
} }
if (A.Address > B.Address) if (A.Address > B.Address)
return true; return true;
if (A.Address == B.Address && A.Name > B.Name) if (A.Address == B.Address && A.Name > B.Name)
return true; return true;
if (A.Address == B.Address && A.Name == B.Name && A.Size > B.Size) return A.Address == B.Address && A.Name == B.Name && A.Size > B.Size;
return true;
return false;
} }
static bool compareSymbolSize(const NMSymbol &A, const NMSymbol &B) { static bool compareSymbolSize(const NMSymbol &A, const NMSymbol &B) {
if (!ReverseSort) { if (!ReverseSort) {
if (A.Size < B.Size) if (A.Size < B.Size)
return true; return true;
if (A.Size == B.Size && A.Name < B.Name) if (A.Size == B.Size && A.Name < B.Name)
return true; return true;
if (A.Size == B.Size && A.Name == B.Name && A.Address < B.Address) return A.Size == B.Size && A.Name == B.Name && A.Address < B.Address;
return true;
return false;
} }
if (A.Size > B.Size) if (A.Size > B.Size)
return true; return true;
if (A.Size == B.Size && A.Name > B.Name) if (A.Size == B.Size && A.Name > B.Name)
return true; return true;
if (A.Size == B.Size && A.Name == B.Name && A.Address > B.Address) return A.Size == B.Size && A.Name == B.Name && A.Address > B.Address;
return true;
return false;
} }
static bool compareSymbolName(const NMSymbol &A, const NMSymbol &B) { static bool compareSymbolName(const NMSymbol &A, const NMSymbol &B) {
if (!ReverseSort) { if (!ReverseSort) {
if (A.Name < B.Name) if (A.Name < B.Name)
return true; return true;
if (A.Name == B.Name && A.Size < B.Size) if (A.Name == B.Name && A.Size < B.Size)
return true; return true;
if (A.Name == B.Name && A.Size == B.Size && A.Address < B.Address) return A.Name == B.Name && A.Size == B.Size && A.Address < B.Address;
return true;
return false;
} }
if (A.Name > B.Name) if (A.Name > B.Name)
return true; return true;
if (A.Name == B.Name && A.Size > B.Size) if (A.Name == B.Name && A.Size > B.Size)
return true; return true;
if (A.Name == B.Name && A.Size == B.Size && A.Address > B.Address) return A.Name == B.Name && A.Size == B.Size && A.Address > B.Address;
return true;
return false;
} }
static char isSymbolList64Bit(SymbolicFile &Obj) { static char isSymbolList64Bit(SymbolicFile &Obj) {
if (isa<IRObjectFile>(Obj)) if (isa<IRObjectFile>(Obj))
return false; return false;
if (isa<COFFObjectFile>(Obj)) if (isa<COFFObjectFile>(Obj))
return false; return false;
if (MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(&Obj)) if (MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(&Obj))
▲ Show 20 Lines • Show All 1,033 Lines • Show Last 20 Lines