Author: Kazu Hirata Date: 2020-12-29T19:23:24-08:00 New Revision: 329b887286ab91872decd56adf1bb87aa30f9707
URL: https://github.com/llvm/llvm-project/commit/329b887286ab91872decd56adf1bb87aa30f9707 DIFF: https://github.com/llvm/llvm-project/commit/329b887286ab91872decd56adf1bb87aa30f9707.diff LOG: [Analysis, IR] Use *Map::lookup (NFC) Added: Modified: llvm/include/llvm/Analysis/RegionInfoImpl.h llvm/include/llvm/Analysis/VectorUtils.h llvm/lib/IR/PassRegistry.cpp llvm/lib/IR/SafepointIRVerifier.cpp Removed: ################################################################################ diff --git a/llvm/include/llvm/Analysis/RegionInfoImpl.h b/llvm/include/llvm/Analysis/RegionInfoImpl.h index bbd3dd5dc0ea..d28aee72dda5 100644 --- a/llvm/include/llvm/Analysis/RegionInfoImpl.h +++ b/llvm/include/llvm/Analysis/RegionInfoImpl.h @@ -815,8 +815,7 @@ void RegionInfoBase<Tr>::verifyAnalysis() const { // Region pass manager support. template <class Tr> typename Tr::RegionT *RegionInfoBase<Tr>::getRegionFor(BlockT *BB) const { - typename BBtoRegionMap::const_iterator I = BBtoRegion.find(BB); - return I != BBtoRegion.end() ? I->second : nullptr; + return BBtoRegion.lookup(BB); } template <class Tr> diff --git a/llvm/include/llvm/Analysis/VectorUtils.h b/llvm/include/llvm/Analysis/VectorUtils.h index c570bf25e92b..d8fb970a9f79 100644 --- a/llvm/include/llvm/Analysis/VectorUtils.h +++ b/llvm/include/llvm/Analysis/VectorUtils.h @@ -655,11 +655,7 @@ template <typename InstTy> class InterleaveGroup { /// \returns nullptr if contains no such member. InstTy *getMember(uint32_t Index) const { int32_t Key = SmallestKey + Index; - auto Member = Members.find(Key); - if (Member == Members.end()) - return nullptr; - - return Member->second; + return Members.lookup(Key); } /// Get the index for the given member. Unlike the key in the member @@ -777,9 +773,7 @@ class InterleavedAccessInfo { /// \returns nullptr if doesn't have such group. InterleaveGroup<Instruction> * getInterleaveGroup(const Instruction *Instr) const { - if (InterleaveGroupMap.count(Instr)) - return InterleaveGroupMap.find(Instr)->second; - return nullptr; + return InterleaveGroupMap.lookup(Instr); } iterator_range<SmallPtrSetIterator<llvm::InterleaveGroup<Instruction> *>> diff --git a/llvm/lib/IR/PassRegistry.cpp b/llvm/lib/IR/PassRegistry.cpp index 0572c4fe5237..94f607afec47 100644 --- a/llvm/lib/IR/PassRegistry.cpp +++ b/llvm/lib/IR/PassRegistry.cpp @@ -40,14 +40,12 @@ PassRegistry::~PassRegistry() = default; const PassInfo *PassRegistry::getPassInfo(const void *TI) const { sys::SmartScopedReader<true> Guard(Lock); - MapType::const_iterator I = PassInfoMap.find(TI); - return I != PassInfoMap.end() ? I->second : nullptr; + return PassInfoMap.lookup(TI); } const PassInfo *PassRegistry::getPassInfo(StringRef Arg) const { sys::SmartScopedReader<true> Guard(Lock); - StringMapType::const_iterator I = PassInfoStringMap.find(Arg); - return I != PassInfoStringMap.end() ? I->second : nullptr; + return PassInfoStringMap.lookup(Arg); } //===----------------------------------------------------------------------===// diff --git a/llvm/lib/IR/SafepointIRVerifier.cpp b/llvm/lib/IR/SafepointIRVerifier.cpp index 6bf7caa50a12..8ed31b6668e0 100644 --- a/llvm/lib/IR/SafepointIRVerifier.cpp +++ b/llvm/lib/IR/SafepointIRVerifier.cpp @@ -561,8 +561,7 @@ GCPtrTracker::GCPtrTracker(const Function &F, const DominatorTree &DT, } BasicBlockState *GCPtrTracker::getBasicBlockState(const BasicBlock *BB) { - auto it = BlockMap.find(BB); - return it != BlockMap.end() ? it->second : nullptr; + return BlockMap.lookup(BB); } const BasicBlockState *GCPtrTracker::getBasicBlockState( _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
