feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Fix -Wmaybe-unitialized warning in gcc-12 by laundering the result of reinterpret_cast<> in functions helper

Browse Source
This commit is contained in:
Christian Mazakas
2022-06-06 15:40:57 -07:00
parent e690e8910c
commit 613a997694
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/boost/unordered/detail/implementation.hpp
View File

@ -1548,6 +1548,21 @@ namespace boost {
// If an exception is thrown between these two calls, use // If an exception is thrown between these two calls, use
// 'cleanup_spare_functions' to destroy the unused constructed functions. // 'cleanup_spare_functions' to destroy the unused constructed functions.
#if defined(_GLIBCXX_HAVE_BUILTIN_LAUNDER)
// gcc-12 warns when accessing the `current_functions` of our `functions`
// class below with `-Wmaybe-unitialized`. By laundering the pointer, we
// silence the warning and assure the compiler that a valid object exists
// in that region of storage. This warning is also generated in C++03
// which does not have `std::launder`. The compiler builtin is always
// available, regardless of the C++ standard used when compiling.
template <class T> T* launder(T* p) BOOST_NOEXCEPT
{
return __builtin_launder(p);
}
#else
template <class T> T* launder(T* p) BOOST_NOEXCEPT { return p; }
#endif
template <class H, class P> class functions template <class H, class P> class functions
{ {
public: public:
@ -1604,14 +1619,16 @@ namespace boost {
function_pair const& current_functions() const function_pair const& current_functions() const
{ {
return *static_cast<function_pair const*>( return *::boost::unordered::detail::launder(
static_cast<void const*>(funcs_[current_ & 1].address())); static_cast<function_pair const*>(
static_cast<void const*>(funcs_[current_ & 1].address())));
} }
function_pair& current_functions() function_pair& current_functions()
{ {
return *static_cast<function_pair*>( return *::boost::unordered::detail::launder(
static_cast<void*>(funcs_[current_ & 1].address())); static_cast<function_pair*>(
static_cast<void*>(funcs_[current_ & 1].address())));
} }
void construct_spare_functions(function_pair const& f) void construct_spare_functions(function_pair const& f)