6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

Switch the SetVector::remove_if implementation to use partition which

Browse Source 
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
This commit is contained in:
Chandler Carruth 2012-10-03 00:03:00 +00:00
parent 2b87e06d26
commit 75eac5f0eb
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/ADT/SetVector.h
View File

@ -141,8 +141,9 @@ public:
/// \returns true if any element is removed. /// \returns true if any element is removed.
template <typename UnaryPredicate> template <typename UnaryPredicate>
bool remove_if(UnaryPredicate P) { bool remove_if(UnaryPredicate P) {
typename vector_type::iterator B = std::remove_if(vector_.begin(), typename vector_type::iterator B = std::partition(vector_.begin(),
vector_.end(), P), vector_.end(),
std::not1(P)),
E = vector_.end(); E = vector_.end();
if (B == E) if (B == E)
return false; return false;

4
lib/Transforms/Scalar/SROA.cpp
View File

@ -3273,8 +3273,10 @@ namespace {
const SetType &Set; const SetType &Set;
public: public:
typedef AllocaInst *argument_type;
IsAllocaInSet(const SetType &Set) : Set(Set) {} IsAllocaInSet(const SetType &Set) : Set(Set) {}
bool operator()(AllocaInst *AI) { return Set.count(AI); } bool operator()(AllocaInst *AI) const { return Set.count(AI); }
}; };
} }