Skip to content

Commit

Permalink
Reland: "[ADT] fix filter_iterator_impl::operator++"
Browse files Browse the repository at this point in the history
  • Loading branch information
abrachet committed Jul 7, 2023
1 parent a2b5117 commit 1c36226
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions llvm/include/llvm/ADT/STLExtras.h
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,16 @@ class filter_iterator_impl<WrappedIteratorT, PredicateT,
PredicateT Pred)
: BaseT(Begin, End, Pred) {}

filter_iterator_impl &operator++() {
BaseT::operator++();
return *this;
}

filter_iterator_impl &operator++(int) {
BaseT::operator++();
return *this;
}

filter_iterator_impl &operator--() {
BaseT::operator--();
findPrevValid();
Expand Down

6 comments on commit 1c36226

@jhuber6
Copy link
Contributor

@jhuber6 jhuber6 commented on 1c36226 Jul 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@abrachet
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be fixed by 1882a4e. Sorry about that

@jhuber6
Copy link
Contributor

@jhuber6 jhuber6 commented on 1c36226 Jul 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be fixed by 1882a4e. Sorry about that

It's still broken after those, see the bots

@abrachet
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have an example? All the emails I am seeing are from before that fix

@jhuber6
Copy link
Contributor

@jhuber6 jhuber6 commented on 1c36226 Jul 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed that reverting both those patches unblocks my build. This is when compiling for the GPU runtime, so presumably if you add -DLLVM_ENABLE_RUNTIMES=openmp it'll try to build it for the GPU.

@abrachet
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found one, as well. Sorry about that. Let me revert

Please sign in to comment.