Author: Kazu Hirata Date: 2021-11-22T08:21:09-08:00 New Revision: bf20a3b9b94a5b6fc97fdba4546391c30ad26a22
URL: https://github.com/llvm/llvm-project/commit/bf20a3b9b94a5b6fc97fdba4546391c30ad26a22 DIFF: https://github.com/llvm/llvm-project/commit/bf20a3b9b94a5b6fc97fdba4546391c30ad26a22.diff LOG: Use std::string::substr (NFC) Added: Modified: clang/lib/Frontend/Rewrite/RewriteModernObjC.cpp clang/lib/Frontend/Rewrite/RewriteObjC.cpp llvm/utils/TableGen/AsmWriterInst.cpp llvm/utils/TableGen/CodeGenTarget.cpp Removed: ################################################################################ diff --git a/clang/lib/Frontend/Rewrite/RewriteModernObjC.cpp b/clang/lib/Frontend/Rewrite/RewriteModernObjC.cpp index 626ec4d71ccdd..b4487f0047155 100644 --- a/clang/lib/Frontend/Rewrite/RewriteModernObjC.cpp +++ b/clang/lib/Frontend/Rewrite/RewriteModernObjC.cpp @@ -633,7 +633,7 @@ static bool IsHeaderFile(const std::string &Filename) { return false; } - std::string Ext = std::string(Filename.begin()+DotPos+1, Filename.end()); + std::string Ext = Filename.substr(DotPos + 1); // C header: .h // C++ header: .hh or .H; return Ext == "h" || Ext == "hh" || Ext == "H"; diff --git a/clang/lib/Frontend/Rewrite/RewriteObjC.cpp b/clang/lib/Frontend/Rewrite/RewriteObjC.cpp index 0750d36b02ac2..b2ecb42c43dd2 100644 --- a/clang/lib/Frontend/Rewrite/RewriteObjC.cpp +++ b/clang/lib/Frontend/Rewrite/RewriteObjC.cpp @@ -569,7 +569,7 @@ static bool IsHeaderFile(const std::string &Filename) { return false; } - std::string Ext = std::string(Filename.begin()+DotPos+1, Filename.end()); + std::string Ext = Filename.substr(DotPos + 1); // C header: .h // C++ header: .hh or .H; return Ext == "h" || Ext == "hh" || Ext == "H"; diff --git a/llvm/utils/TableGen/AsmWriterInst.cpp b/llvm/utils/TableGen/AsmWriterInst.cpp index cf24f79334cad..887abbac9d3b4 100644 --- a/llvm/utils/TableGen/AsmWriterInst.cpp +++ b/llvm/utils/TableGen/AsmWriterInst.cpp @@ -147,8 +147,7 @@ AsmWriterInst::AsmWriterInst(const CodeGenInstruction &CGI, unsigned CGIIndex, std::string::size_type ModifierStart = VarEnd; while (VarEnd < AsmString.size() && isIdentChar(AsmString[VarEnd])) ++VarEnd; - Modifier = std::string(AsmString.begin()+ModifierStart, - AsmString.begin()+VarEnd); + Modifier = AsmString.substr(ModifierStart, VarEnd - ModifierStart); if (Modifier.empty()) PrintFatalError(CGI.TheDef->getLoc(), "Bad operand modifier name in '" + diff --git a/llvm/utils/TableGen/CodeGenTarget.cpp b/llvm/utils/TableGen/CodeGenTarget.cpp index 137f99078faf6..d3beaf61989eb 100644 --- a/llvm/utils/TableGen/CodeGenTarget.cpp +++ b/llvm/utils/TableGen/CodeGenTarget.cpp @@ -676,12 +676,11 @@ CodeGenIntrinsic::CodeGenIntrinsic(Record *R, isSpeculatable = false; hasSideEffects = false; - if (DefName.size() <= 4 || - std::string(DefName.begin(), DefName.begin() + 4) != "int_") + if (DefName.size() <= 4 || DefName.substr(0, 4) != "int_") PrintFatalError(DefLoc, "Intrinsic '" + DefName + "' does not start with 'int_'!"); - EnumName = std::string(DefName.begin()+4, DefName.end()); + EnumName = DefName.substr(4); if (R->getValue("GCCBuiltinName")) // Ignore a missing GCCBuiltinName field. GCCBuiltinName = std::string(R->getValueAsString("GCCBuiltinName")); @@ -699,8 +698,7 @@ CodeGenIntrinsic::CodeGenIntrinsic(Record *R, Name += (EnumName[i] == '_') ? '.' : EnumName[i]; } else { // Verify it starts with "llvm.". - if (Name.size() <= 5 || - std::string(Name.begin(), Name.begin() + 5) != "llvm.") + if (Name.size() <= 5 || Name.substr(0, 5) != "llvm.") PrintFatalError(DefLoc, "Intrinsic '" + DefName + "'s name does not start with 'llvm.'!"); } @@ -709,8 +707,7 @@ CodeGenIntrinsic::CodeGenIntrinsic(Record *R, // "llvm.<targetprefix>.". if (!TargetPrefix.empty()) { if (Name.size() < 6+TargetPrefix.size() || - std::string(Name.begin() + 5, Name.begin() + 6 + TargetPrefix.size()) - != (TargetPrefix + ".")) + Name.substr(5, 1 + TargetPrefix.size()) != (TargetPrefix + ".")) PrintFatalError(DefLoc, "Intrinsic '" + DefName + "' does not start with 'llvm." + TargetPrefix + ".'!"); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
