Author: Kazu Hirata Date: 2020-12-18T09:09:04-08:00 New Revision: ce94e7d867abf5c08f5b0008f2d31b3f169b815d
URL: https://github.com/llvm/llvm-project/commit/ce94e7d867abf5c08f5b0008f2d31b3f169b815d DIFF: https://github.com/llvm/llvm-project/commit/ce94e7d867abf5c08f5b0008f2d31b3f169b815d.diff LOG: [MCA, ExecutionEngine, Object] Use llvm::is_contained (NFC) Added: Modified: llvm/include/llvm/MCA/HardwareUnits/Scheduler.h llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp llvm/lib/Object/MachOObjectFile.cpp Removed: ################################################################################ diff --git a/llvm/include/llvm/MCA/HardwareUnits/Scheduler.h b/llvm/include/llvm/MCA/HardwareUnits/Scheduler.h index 6c196757e571..0293364e26ef 100644 --- a/llvm/include/llvm/MCA/HardwareUnits/Scheduler.h +++ b/llvm/include/llvm/MCA/HardwareUnits/Scheduler.h @@ -267,9 +267,9 @@ class Scheduler : public HardwareUnit { // This routine performs a sanity check. This routine should only be called // when we know that 'IR' is not in the scheduler's instruction queues. void sanityCheck(const InstRef &IR) const { - assert(find(WaitSet, IR) == WaitSet.end() && "Already in the wait set!"); - assert(find(ReadySet, IR) == ReadySet.end() && "Already in the ready set!"); - assert(find(IssuedSet, IR) == IssuedSet.end() && "Already executing!"); + assert(!is_contained(WaitSet, IR) && "Already in the wait set!"); + assert(!is_contained(ReadySet, IR) && "Already in the ready set!"); + assert(!is_contained(IssuedSet, IR) && "Already executing!"); } #endif // !NDEBUG }; diff --git a/llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp b/llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp index a6cccb90936c..0ad666ebbebd 100644 --- a/llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp +++ b/llvm/lib/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp @@ -167,8 +167,7 @@ void RTDyldObjectLinkingLayer::emit( void RTDyldObjectLinkingLayer::registerJITEventListener(JITEventListener &L) { std::lock_guard<std::mutex> Lock(RTDyldLayerMutex); - assert(llvm::none_of(EventListeners, - [&](JITEventListener *O) { return O == &L; }) && + assert(!llvm::is_contained(EventListeners, &L) && "Listener has already been registered"); EventListeners.push_back(&L); } diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index 9ed2b8acc7e0..302255926289 100644 --- a/llvm/lib/Object/MachOObjectFile.cpp +++ b/llvm/lib/Object/MachOObjectFile.cpp @@ -2743,7 +2743,7 @@ Triple MachOObjectFile::getHostArch() { bool MachOObjectFile::isValidArch(StringRef ArchFlag) { auto validArchs = getValidArchs(); - return llvm::find(validArchs, ArchFlag) != validArchs.end(); + return llvm::is_contained(validArchs, ArchFlag); } ArrayRef<StringRef> MachOObjectFile::getValidArchs() { _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits