diff --git a/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp b/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp index d3fe218c19a14..dd74eb054a34c 100644 --- a/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp +++ b/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp @@ -260,8 +260,8 @@ void MCDCRecord::findIndependencePairs() { // Will be replaced to shorter expr. unsigned TVTrueIdx = std::distance( TV.begin(), - std::find_if(TV.begin(), TV.end(), - [&](auto I) { return (I.second == MCDCRecord::MCDC_True); }) + llvm::find_if(TV, + [&](auto I) { return (I.second == MCDCRecord::MCDC_True); }) ); for (unsigned I = TVTrueIdx; I < NumTVs; ++I) { diff --git a/llvm/lib/Target/AMDGPU/AMDGPULateCodeGenPrepare.cpp b/llvm/lib/Target/AMDGPU/AMDGPULateCodeGenPrepare.cpp index eab76bb79c969..f0d63f523088b 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPULateCodeGenPrepare.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPULateCodeGenPrepare.cpp @@ -386,10 +386,9 @@ bool LiveRegOptimizer::optimizeLiveType( Value *NextDeadValue = PHIWorklist.pop_back_val(); VisitedPhis.insert(NextDeadValue); auto OriginalPhi = - std::find_if(PhiNodes.begin(), PhiNodes.end(), - [this, &NextDeadValue](PHINode *CandPhi) { - return ValMap[CandPhi] == NextDeadValue; - }); + llvm::find_if(PhiNodes, [this, &NextDeadValue](PHINode *CandPhi) { + return ValMap[CandPhi] == NextDeadValue; + }); // This PHI may have already been removed from maps when // unwinding a previous Phi if (OriginalPhi != PhiNodes.end()) diff --git a/llvm/lib/Target/AMDGPU/AMDGPUPreloadKernelArguments.cpp b/llvm/lib/Target/AMDGPU/AMDGPUPreloadKernelArguments.cpp index c1626b4fac869..5027705ef61de 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUPreloadKernelArguments.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPUPreloadKernelArguments.cpp @@ -229,18 +229,16 @@ class PreloadKernelArgInfo { // If we fail to preload any implicit argument we know we don't have SGPRs // to preload any subsequent ones with larger offsets. Find the first // argument that we cannot preload. - auto *PreloadEnd = - std::find_if(ImplicitArgLoads.begin(), ImplicitArgLoads.end(), - [&](const std::pair &Load) { - unsigned LoadSize = - DL.getTypeStoreSize(Load.first->getType()); - unsigned LoadOffset = Load.second; - if (!canPreloadKernArgAtOffset(LoadOffset + LoadSize + - ImplicitArgsBaseOffset)) - return true; - - return false; - }); + auto *PreloadEnd = llvm::find_if( + ImplicitArgLoads, [&](const std::pair &Load) { + unsigned LoadSize = DL.getTypeStoreSize(Load.first->getType()); + unsigned LoadOffset = Load.second; + if (!canPreloadKernArgAtOffset(LoadOffset + LoadSize + + ImplicitArgsBaseOffset)) + return true; + + return false; + }); if (PreloadEnd == ImplicitArgLoads.begin()) return;