From 89d0937348ebd4b55f17d503910be9300aa44a13 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sun, 19 May 2024 18:17:53 -0700 Subject: [PATCH] [llvm] Use StringRef::contains (NFC) (#92710) --- llvm/lib/IR/Mangler.cpp | 2 +- llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp | 2 +- llvm/lib/TextAPI/Utils.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/lib/IR/Mangler.cpp b/llvm/lib/IR/Mangler.cpp index 72e2bc1f24ac97..019fe844e286c8 100644 --- a/llvm/lib/IR/Mangler.cpp +++ b/llvm/lib/IR/Mangler.cpp @@ -292,7 +292,7 @@ void llvm::emitLinkerFlagsForUsedCOFF(raw_ostream &OS, const GlobalValue *GV, std::optional llvm::getArm64ECMangledFunctionName(StringRef Name) { bool IsCppFn = Name[0] == '?'; - if (IsCppFn && Name.find("$$h") != std::string::npos) + if (IsCppFn && Name.contains("$$h")) return std::nullopt; if (!IsCppFn && Name[0] == '#') return std::nullopt; diff --git a/llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp b/llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp index 32de8b9587b46f..9fde26c900f510 100644 --- a/llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp +++ b/llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp @@ -1886,7 +1886,7 @@ static bool buildEnqueueKernel(const SPIRV::IncomingCall *Call, // Local sizes arguments: Sizes of block invoke arguments. Clang generates // local size operands as an array, so we need to unpack them. SmallVector LocalSizes; - if (Call->Builtin->Name.find("_varargs") != StringRef::npos || IsSpirvOp) { + if (Call->Builtin->Name.contains("_varargs") || IsSpirvOp) { const unsigned LocalSizeArrayIdx = HasEvents ? 9 : 6; Register GepReg = Call->Arguments[LocalSizeArrayIdx]; MachineInstr *GepMI = MRI->getUniqueVRegDef(GepReg); diff --git a/llvm/lib/TextAPI/Utils.cpp b/llvm/lib/TextAPI/Utils.cpp index 08f14f65177ed3..01021e3a264dd8 100644 --- a/llvm/lib/TextAPI/Utils.cpp +++ b/llvm/lib/TextAPI/Utils.cpp @@ -184,7 +184,7 @@ llvm::Expected llvm::MachO::createRegexFromGlob(StringRef Glob) { break; } default: - if (RegexMetachars.find(C) != StringRef::npos) + if (RegexMetachars.contains(C)) RegexString.push_back('\\'); RegexString.push_back(C); }