Author: Kazu Hirata Date: 2021-01-11T18:48:09-08:00 New Revision: e5b4dbab041f6692b8c5286406e2566be87feac9
URL: https://github.com/llvm/llvm-project/commit/e5b4dbab041f6692b8c5286406e2566be87feac9 DIFF: https://github.com/llvm/llvm-project/commit/e5b4dbab041f6692b8c5286406e2566be87feac9.diff LOG: [llvm] Simplify string comparisons (NFC) Identified with readability-string-compare. Added: Modified: llvm/lib/Option/OptTable.cpp llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp llvm/tools/llvm-mca/llvm-mca.cpp llvm/tools/llvm-profdata/llvm-profdata.cpp llvm/utils/TableGen/GlobalISelEmitter.cpp Removed: ################################################################################ diff --git a/llvm/lib/Option/OptTable.cpp b/llvm/lib/Option/OptTable.cpp index 9564b4433f0c..c78c2cee1edf 100644 --- a/llvm/lib/Option/OptTable.cpp +++ b/llvm/lib/Option/OptTable.cpp @@ -243,7 +243,7 @@ OptTable::findByPrefix(StringRef Cur, unsigned int DisableFlags) const { std::string S = std::string(In.Prefixes[I]) + std::string(In.Name) + "\t"; if (In.HelpText) S += In.HelpText; - if (StringRef(S).startswith(Cur) && S.compare(std::string(Cur) + "\t")) + if (StringRef(S).startswith(Cur) && S != std::string(Cur) + "\t") Ret.push_back(S); } } diff --git a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp index 34fd0b883d2a..cce21f32414a 100644 --- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp +++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp @@ -2201,7 +2201,7 @@ bool PPCAIXAsmPrinter::doInitialization(Module &M) { // the sinit and sterm function names. if (FormatIndicatorAndUniqueModId.empty()) { std::string UniqueModuleId = getUniqueModuleId(&M); - if (UniqueModuleId.compare("") != 0) + if (UniqueModuleId != "") // TODO: Use source file full path to generate the unique module id // and add a format indicator as a part of function name in case we // will support more than one format. diff --git a/llvm/tools/llvm-mca/llvm-mca.cpp b/llvm/tools/llvm-mca/llvm-mca.cpp index 48731c366b7f..d122e641ad25 100644 --- a/llvm/tools/llvm-mca/llvm-mca.cpp +++ b/llvm/tools/llvm-mca/llvm-mca.cpp @@ -325,7 +325,7 @@ int main(int argc, char **argv) { // Apply overrides to llvm-mca specific options. processViewOptions(); - if (!MCPU.compare("native")) + if (MCPU == "native") MCPU = std::string(llvm::sys::getHostCPUName()); std::unique_ptr<MCSubtargetInfo> STI( diff --git a/llvm/tools/llvm-profdata/llvm-profdata.cpp b/llvm/tools/llvm-profdata/llvm-profdata.cpp index ad188b6a5e92..0e2c75855ddd 100644 --- a/llvm/tools/llvm-profdata/llvm-profdata.cpp +++ b/llvm/tools/llvm-profdata/llvm-profdata.cpp @@ -2430,7 +2430,7 @@ static int show_main(int argc, const char *argv[]) { if (OutputFilename.empty()) OutputFilename = "-"; - if (!Filename.compare(OutputFilename)) { + if (Filename == OutputFilename) { errs() << sys::path::filename(argv[0]) << ": Input file name cannot be the same as the output file name!\n"; return 1; diff --git a/llvm/utils/TableGen/GlobalISelEmitter.cpp b/llvm/utils/TableGen/GlobalISelEmitter.cpp index c10f85abccc4..4be53930fc56 100644 --- a/llvm/utils/TableGen/GlobalISelEmitter.cpp +++ b/llvm/utils/TableGen/GlobalISelEmitter.cpp @@ -935,7 +935,7 @@ class RuleMatcher : public Matcher { std::string ParentName(ParentSymbolicName); if (ComplexSubOperands.count(SymbolicName)) { auto RecordedParentName = ComplexSubOperandsParentName[SymbolicName]; - if (RecordedParentName.compare(ParentName) != 0) + if (RecordedParentName != ParentName) return failedImport("Error: Complex suboperand " + SymbolicName + " referenced by diff erent operands: " + RecordedParentName + " and " + ParentName + "."); @@ -1331,7 +1331,7 @@ class RecordNamedOperandMatcher : public OperandPredicateMatcher { bool isIdentical(const PredicateMatcher &B) const override { return OperandPredicateMatcher::isIdentical(B) && StoreIdx == cast<RecordNamedOperandMatcher>(&B)->StoreIdx && - Name.compare(cast<RecordNamedOperandMatcher>(&B)->Name) == 0; + Name == cast<RecordNamedOperandMatcher>(&B)->Name; } void emitPredicateOpcodes(MatchTable &Table, _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits