From 75eac5f0ebff4d0ffe10ce6bc8f2867c5f15315b Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Wed, 3 Oct 2012 00:03:00 +0000 Subject: [PATCH 1/1] Switch the SetVector::remove_if implementation to use partition which preserves the values of the relocated entries, unlikely remove_if. This allows walking them and erasing them. Also flesh out the predicate we are using for this to support the various constraints actually imposed on a UnaryPredicate -- without this we can't compose it with std::not1. Thanks to Sean Silva for the review here and noticing the issue with std::remove_if. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165073 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/SetVector.h | 5 +++-- lib/Transforms/Scalar/SROA.cpp | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/llvm/ADT/SetVector.h b/include/llvm/ADT/SetVector.h index e8d63edf9e5..0ff0f46f88d 100644 --- a/include/llvm/ADT/SetVector.h +++ b/include/llvm/ADT/SetVector.h @@ -141,8 +141,9 @@ public: /// \returns true if any element is removed. template bool remove_if(UnaryPredicate P) { - typename vector_type::iterator B = std::remove_if(vector_.begin(), - vector_.end(), P), + typename vector_type::iterator B = std::partition(vector_.begin(), + vector_.end(), + std::not1(P)), E = vector_.end(); if (B == E) return false; diff --git a/lib/Transforms/Scalar/SROA.cpp b/lib/Transforms/Scalar/SROA.cpp index 58c3bc0f200..316742a0da6 100644 --- a/lib/Transforms/Scalar/SROA.cpp +++ b/lib/Transforms/Scalar/SROA.cpp @@ -3273,8 +3273,10 @@ namespace { const SetType &Set; public: + typedef AllocaInst *argument_type; + IsAllocaInSet(const SetType &Set) : Set(Set) {} - bool operator()(AllocaInst *AI) { return Set.count(AI); } + bool operator()(AllocaInst *AI) const { return Set.count(AI); } }; } -- 2.34.1