From 6aaaf4ab09220254c45b7263f556cd7fb02ba405 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Sat, 3 Dec 2016 19:49:27 +0000 Subject: [PATCH] [PM] Consistently use curly braces rather than std::make_pair in AnalysisResults.find(). Reviewers: chandlerc Subscribers: silvas, llvm-commits, mehdi_amini Differential Revision: https://reviews.llvm.org/D27372 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@288596 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/IR/PassManager.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/llvm/IR/PassManager.h b/include/llvm/IR/PassManager.h index b7e60471700..ccc35d0194a 100644 --- a/include/llvm/IR/PassManager.h +++ b/include/llvm/IR/PassManager.h @@ -477,7 +477,7 @@ public: return; // Clear the map pointing into the results list. for (auto &IDAndResult : ResultsListI->second) - AnalysisResults.erase(std::make_pair(IDAndResult.first, &IR)); + AnalysisResults.erase({IDAndResult.first, &IR}); // And actually destroy and erase the results associated with this IR. AnalysisResultLists.erase(ResultsListI); @@ -676,7 +676,7 @@ private: // P.run may have inserted elements into AnalysisResults and invalidated // RI. - RI = AnalysisResults.find(std::make_pair(ID, &IR)); + RI = AnalysisResults.find({ID, &IR}); assert(RI != AnalysisResults.end() && "we just inserted it!"); RI->second = std::prev(ResultList.end()); @@ -688,14 +688,14 @@ private: /// \brief Get a cached analysis result or return null. ResultConceptT *getCachedResultImpl(AnalysisKey *ID, IRUnitT &IR) const { typename AnalysisResultMapT::const_iterator RI = - AnalysisResults.find(std::make_pair(ID, &IR)); + AnalysisResults.find({ID, &IR}); return RI == AnalysisResults.end() ? nullptr : &*RI->second->second; } /// \brief Invalidate a function pass result. void invalidateImpl(AnalysisKey *ID, IRUnitT &IR) { typename AnalysisResultMapT::iterator RI = - AnalysisResults.find(std::make_pair(ID, &IR)); + AnalysisResults.find({ID, &IR}); if (RI == AnalysisResults.end()) return; -- 2.50.1