Skip to content

boost::intrusive_list #1245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
caleridas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

boost::intrusive_list #1245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions jlm/rvsdg/node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Input::Input(rvsdg::Node & owner, rvsdg::Output & origin, std::shared_ptr<const
: index_(0),
Owner_(&owner),
Type_(std::move(type)),
UsersList_()
UsersListAnchor_()
{
CheckTypes(*owner.region(), origin, Type_);
origin.add_user(this);
Expand All @@ -49,7 +49,7 @@ Input::Input(rvsdg::Region & owner, rvsdg::Output & origin, std::shared_ptr<cons
: index_(0),
Owner_(&owner),
Type_(std::move(type)),
UsersList_()
UsersListAnchor_()
{
CheckTypes(owner, origin, Type_);
origin.add_user(this);
Expand Down Expand Up @@ -180,7 +180,7 @@ Output::remove_user(jlm::rvsdg::Input * user)
JLM_ASSERT(user->origin_ == this);
user->origin_ = nullptr;

Users_.erase(user);
Users_.erase(Users_.iterator_to(*user));
NumUsers_ -= 1;

if (auto node = TryGetOwnerNode<Node>(*this))
Expand Down Expand Up @@ -208,7 +208,7 @@ Output::add_user(jlm::rvsdg::Input * user)
}
}

Users_.push_back(user);
Users_.push_back(*user);
NumUsers_ += 1;
}

Expand Down
14 changes: 9 additions & 5 deletions jlm/rvsdg/node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#include <utility>
#include <variant>

#include <boost/intrusive/list.hpp>

namespace jlm::rvsdg
{

Expand Down Expand Up @@ -223,9 +225,11 @@ class Input
jlm::rvsdg::Output * origin_ = nullptr;
std::variant<Node *, Region *> Owner_;
std::shared_ptr<const rvsdg::Type> Type_;
jlm::util::IntrusiveListAnchor<Input> UsersList_;
using UsersListAccessor = jlm::util::intrusive_list_accessor<Input, &Input::UsersList_>;
using UsersList = jlm::util::IntrusiveList<Input, UsersListAccessor>;
boost::intrusive::list_member_hook<> UsersListAnchor_;
using UsersList = boost::intrusive::list<
Input,
boost::intrusive::
member_hook<Input, boost::intrusive::list_member_hook<>, &Input::UsersListAnchor_>>;

friend class Output;
};
Expand All @@ -249,8 +253,8 @@ class Output

public:
using UsersList = Input::UsersList;
using UsersRange = jlm::util::IteratorRange<UsersList::Iterator>;
using UsersConstRange = jlm::util::IteratorRange<UsersList::ConstIterator>;
using UsersRange = jlm::util::IteratorRange<UsersList::iterator>;
using UsersConstRange = jlm::util::IteratorRange<UsersList::const_iterator>;

virtual ~Output() noexcept;

Expand Down
Loading