Author: Kazu Hirata Date: 2021-10-23T20:41:46-07:00 New Revision: 4ba9d9c84f4ce05eec341dc5f2d1c95934ab3d2c
URL: https://github.com/llvm/llvm-project/commit/4ba9d9c84f4ce05eec341dc5f2d1c95934ab3d2c DIFF: https://github.com/llvm/llvm-project/commit/4ba9d9c84f4ce05eec341dc5f2d1c95934ab3d2c.diff LOG: Use StringRef::contains (NFC) Added: Modified: clang-tools-extra/modularize/CoverageChecker.cpp lld/COFF/PDB.cpp lldb/source/Commands/CommandObjectWatchpoint.cpp lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp lldb/source/Plugins/Language/CPlusPlus/MSVCUndecoratedNameParser.cpp lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp lldb/tools/lldb-vscode/lldb-vscode.cpp mlir/lib/IR/MLIRContext.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/modularize/CoverageChecker.cpp b/clang-tools-extra/modularize/CoverageChecker.cpp index b115d59aaba85..b1c787862c02d 100644 --- a/clang-tools-extra/modularize/CoverageChecker.cpp +++ b/clang-tools-extra/modularize/CoverageChecker.cpp @@ -381,8 +381,7 @@ bool CoverageChecker::collectFileSystemHeaders(StringRef IncludePath) { continue; // Assume directories or files starting with '.' are private and not to // be considered. - if ((file.find("\\.") != StringRef::npos) || - (file.find("/.") != StringRef::npos)) + if (file.contains("\\.") || file.contains("/.")) continue; // If the file does not have a common header extension, ignore it. if (!ModularizeUtilities::isHeader(file)) diff --git a/lld/COFF/PDB.cpp b/lld/COFF/PDB.cpp index 73feddaa202d8..00e171017f4bf 100644 --- a/lld/COFF/PDB.cpp +++ b/lld/COFF/PDB.cpp @@ -1347,8 +1347,8 @@ static std::string quote(ArrayRef<StringRef> args) { for (StringRef a : args) { if (!r.empty()) r.push_back(' '); - bool hasWS = a.find(' ') != StringRef::npos; - bool hasQ = a.find('"') != StringRef::npos; + bool hasWS = a.contains(' '); + bool hasQ = a.contains('"'); if (hasWS || hasQ) r.push_back('"'); if (hasQ) { diff --git a/lldb/source/Commands/CommandObjectWatchpoint.cpp b/lldb/source/Commands/CommandObjectWatchpoint.cpp index d7a446fc366c5..9fbf036a19d1a 100644 --- a/lldb/source/Commands/CommandObjectWatchpoint.cpp +++ b/lldb/source/Commands/CommandObjectWatchpoint.cpp @@ -56,7 +56,7 @@ static int32_t WithRSAIndex(llvm::StringRef Arg) { uint32_t i; for (i = 0; i < 4; ++i) - if (Arg.find(RSA[i]) != llvm::StringRef::npos) + if (Arg.contains(RSA[i])) return i; return -1; } diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp index d9ab17eece888..a0cff3cc9bf8e 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp @@ -1309,7 +1309,7 @@ static bool FindFunctionInModule(ConstString &mangled_name, llvm::Module *module, const char *orig_name) { for (const auto &func : module->getFunctionList()) { const StringRef &name = func.getName(); - if (name.find(orig_name) != StringRef::npos) { + if (name.contains(orig_name)) { mangled_name.SetString(name); return true; } diff --git a/lldb/source/Plugins/Language/CPlusPlus/MSVCUndecoratedNameParser.cpp b/lldb/source/Plugins/Language/CPlusPlus/MSVCUndecoratedNameParser.cpp index b24bcc1344e23..8ecf6712eace2 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/MSVCUndecoratedNameParser.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/MSVCUndecoratedNameParser.cpp @@ -72,7 +72,7 @@ MSVCUndecoratedNameParser::MSVCUndecoratedNameParser(llvm::StringRef name) { } bool MSVCUndecoratedNameParser::IsMSVCUndecoratedName(llvm::StringRef name) { - return name.find('`') != llvm::StringRef::npos; + return name.contains('`'); } bool MSVCUndecoratedNameParser::ExtractContextAndIdentifier( diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp index 9550cb53e9e83..a43f8c004aaae 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -1543,17 +1543,17 @@ Status GDBRemoteCommunicationClient::GetMemoryRegionInfo( region_info.GetRange().IsValid()) { saw_permissions = true; if (region_info.GetRange().Contains(addr)) { - if (value.find('r') != llvm::StringRef::npos) + if (value.contains('r')) region_info.SetReadable(MemoryRegionInfo::eYes); else region_info.SetReadable(MemoryRegionInfo::eNo); - if (value.find('w') != llvm::StringRef::npos) + if (value.contains('w')) region_info.SetWritable(MemoryRegionInfo::eYes); else region_info.SetWritable(MemoryRegionInfo::eNo); - if (value.find('x') != llvm::StringRef::npos) + if (value.contains('x')) region_info.SetExecutable(MemoryRegionInfo::eYes); else region_info.SetExecutable(MemoryRegionInfo::eNo); diff --git a/lldb/tools/lldb-vscode/lldb-vscode.cpp b/lldb/tools/lldb-vscode/lldb-vscode.cpp index 5c237c00deabe..71bdcaef0dff4 100644 --- a/lldb/tools/lldb-vscode/lldb-vscode.cpp +++ b/lldb/tools/lldb-vscode/lldb-vscode.cpp @@ -2747,7 +2747,7 @@ void request_setVariable(const llvm::json::Object &request) { const auto variablesReference = GetUnsigned(arguments, "variablesReference", 0); llvm::StringRef name = GetString(arguments, "name"); - bool is_duplicated_variable_name = name.find(" @") != llvm::StringRef::npos; + bool is_duplicated_variable_name = name.contains(" @"); const auto value = GetString(arguments, "value"); // Set success to false just in case we don't find the variable by name diff --git a/mlir/lib/IR/MLIRContext.cpp b/mlir/lib/IR/MLIRContext.cpp index dd1fa945fb029..065568379a06b 100644 --- a/mlir/lib/IR/MLIRContext.cpp +++ b/mlir/lib/IR/MLIRContext.cpp @@ -853,7 +853,7 @@ Identifier Identifier::get(const Twine &string, MLIRContext *context) { // identifier table - if we already had it in the table, then it already // passed invariant checks. assert(!str.empty() && "Cannot create an empty identifier"); - assert(str.find('\0') == StringRef::npos && + assert(!str.contains('\0') && "Cannot create an identifier with a nul character"); auto getDialectOrContext = [&]() { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
