Skip to content

Refactor storage_ptr #1141

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

Draft
grisumbras wants to merge 2 commits into
base: develop
Choose a base branch
from
+28 −22
Draft

Refactor storage_ptr #1141

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ab921f
refactor storage_ptr to appease Fil-C
grisumbras Nov 19, 2025
2a6899d
temp
grisumbras May 26, 2026
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
50 changes: 28 additions & 22 deletions include/boost/json/storage_ptr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@ class storage_ptr
using default_resource =
detail::default_resource;

std::uintptr_t i_;
void* p_;

shared_resource*
get_shared() const noexcept
{
auto const i = reinterpret_cast<std::uintptr_t>(p_) & ~3;
return static_cast<shared_resource*>(
reinterpret_cast<container::pmr::memory_resource*>(
i_ & ~3));
reinterpret_cast<container::pmr::memory_resource*>(i));
}

void
Expand All @@ -116,9 +116,10 @@ class storage_ptr
template<class T>
storage_ptr(
detail::shared_resource_impl<T>* p) noexcept
: i_(reinterpret_cast<std::uintptr_t>(
static_cast<container::pmr::memory_resource*>(p)) + 1 +
(json::is_deallocate_trivial<T>::value ? 2 : 0))
: p_(reinterpret_cast<void*>(
reinterpret_cast<std::uintptr_t>(
static_cast<container::pmr::memory_resource*>(p))
+ 1 + (json::is_deallocate_trivial<T>::value ? 2 : 0)))
{
BOOST_ASSERT(p);
}
Expand Down Expand Up @@ -184,7 +185,7 @@ class storage_ptr
@{
*/
storage_ptr() noexcept
: i_(0)
: p_(nullptr)
{
}

Expand All @@ -201,9 +202,10 @@ class storage_ptr
#endif
>
storage_ptr(T* r) noexcept
: i_(reinterpret_cast<std::uintptr_t>(
static_cast<container::pmr::memory_resource *>(r)) +
(json::is_deallocate_trivial<T>::value ? 2 : 0))
: p_(reinterpret_cast<void*>(
reinterpret_cast<std::uintptr_t>(
static_cast<container::pmr::memory_resource*>(r))
+ (json::is_deallocate_trivial<T>::value ? 2 : 0)))
{
BOOST_ASSERT(r);
}
Expand All @@ -217,8 +219,7 @@ class storage_ptr
template<class V>
storage_ptr(
container::pmr::polymorphic_allocator<V> const& alloc) noexcept
: i_(reinterpret_cast<std::uintptr_t>(
alloc.resource()))
: p_(alloc.resource())
{
}

Expand All @@ -228,7 +229,7 @@ class storage_ptr
*/
storage_ptr(
storage_ptr&& other) noexcept
: i_(detail::exchange(other.i_, 0))
: p_(detail::exchange(other.p_, nullptr))
{
}

Expand All @@ -238,7 +239,7 @@ class storage_ptr
*/
storage_ptr(
storage_ptr const& other) noexcept
: i_(other.i_)
: p_(other.p_)
{
addref();
}
Expand Down Expand Up @@ -277,7 +278,7 @@ class storage_ptr
storage_ptr&& other) noexcept
{
release();
i_ = detail::exchange(other.i_, 0);
p_ = detail::exchange(other.p_, nullptr);
return *this;
}

Expand All @@ -287,7 +288,7 @@ class storage_ptr
{
other.addref();
release();
i_ = other.i_;
p_ = other.p_;
return *this;
}
/// @}
Expand All @@ -300,7 +301,8 @@ class storage_ptr
bool
is_shared() const noexcept
{
return (i_ & 1) != 0;
auto const i = reinterpret_cast<std::uintptr_t>(p_);
return (i & 1) != 0;
}

/** Check if calling `deallocate` on the memory resource has no effect.
Expand All @@ -313,7 +315,8 @@ class storage_ptr
bool
is_deallocate_trivial() const noexcept
{
return (i_ & 2) != 0;
auto const i = reinterpret_cast<std::uintptr_t>(p_);
return (i & 2) != 0;
}

/** Check if ownership of the memory resource is not shared and deallocate is trivial.
Expand All @@ -325,7 +328,8 @@ class storage_ptr
bool
is_not_shared_and_deallocate_is_trivial() const noexcept
{
return (i_ & 3) == 2;
auto const i = reinterpret_cast<std::uintptr_t>(p_);
return (i & 3) == 2;
}

/** Return a pointer to the memory resource.
Expand All @@ -342,9 +346,11 @@ class storage_ptr
container::pmr::memory_resource*
get() const noexcept
{
if(i_ != 0)
return reinterpret_cast<
container::pmr::memory_resource*>(i_ & ~3);
if(p_)
{
auto const i = reinterpret_cast<std::uintptr_t>(p_) & ~3;
return reinterpret_cast<container::pmr::memory_resource*>(i);
}
return default_resource::get();
}

Expand Down
Loading