Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

boost: backport fix for fix aliasing violation in boost::container

Browse Source 
backport patch taken from gentoo (thanks!)

Fixes #17977
This commit is contained in:
Christoph Reiter
2024-07-07 14:48:49 +02:00
parent 19549c962b
commit cf969ae5ce
2 changed files with 418 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mingw-w64-boost/PKGBUILD
View File

@@ -8,7 +8,7 @@ pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.85.0
_boostver=${pkgver//./_}
pkgrel=2
pkgrel=3
pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -43,7 +43,8 @@ source=(https://boostorg.jfrog.io/artifactory/main/release/${pkgver}/source/boos
using-mingw-w64-python.patch
msys2-mingw-folders-bootstrap.patch
0010-cmake-prefer-shared-libs-over-static-on-MINGW.patch
0012-allow-longer-path-on-mingw-w64.patch)
0012-allow-longer-path-on-mingw-w64.patch
boost-1.85.0-container-aliasing.patch)
sha256sums=('7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617'
'a23f9afeb620a0e82b6c158d592a555516dd985f82a9e24021f02a29651cb49b'
'cf46e9b791b45937d5af26b0f35dcdfa416cd9b62ef6c29e3064464835634628'
@@ -54,7 +55,8 @@ sha256sums=('7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617'
'5c38e08ba63695afa79a29d5d3ea22ef1ecf79f91d48ae922e1a489e83782742'
'5117629ee577de0da800b6923675683ba69422cdbe958e70c9081fdc6886402e'
'87e3a33aa402b2f3ea23dc75c6522111ea81b86019aff2ca3779999b82e1acbe'
'fdc78579f8f057defc59368f22b1304b138b155df13b953b5f10b57c633ed639')
'fdc78579f8f057defc59368f22b1304b138b155df13b953b5f10b57c633ed639'
'968844daf8cfb841e12fa24404ae189549ba3bc6e6037651293e4c247b630e90')
# Helper macros to help make tasks easier #
apply_patch_with_msg() {
@@ -104,6 +106,11 @@ prepare() {
# This patch increase that limit to 32000 (Cygwin `getconf ARG_MAX`)
apply_patch_with_msg \
0012-allow-longer-path-on-mingw-w64.patch
# https://github.com/boostorg/container/commit/20ad12f20e661978e90dc7f36d8ab8ac05e5a5a9
# https://github.com/msys2/MINGW-packages/issues/17977
apply_patch_with_msg \
boost-1.85.0-container-aliasing.patch
}
setb2args() {

408
mingw-w64-boost/boost-1.85.0-container-aliasing.patch Normal file
View File

@@ -0,0 +1,408 @@
https://bugs.gentoo.org/933289 (and https://bugs.gentoo.org/932780, https://bugs.gentoo.org/931587)
https://github.com/freeorion/freeorion/issues/4949
https://github.com/boostorg/container/issues/252
https://github.com/boostorg/container/issues/281
https://github.com/boostorg/container/commit/20ad12f20e661978e90dc7f36d8ab8ac05e5a5a9
From 20ad12f20e661978e90dc7f36d8ab8ac05e5a5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Sun, 28 Apr 2024 23:29:59 +0200
Subject: [PATCH] Remove UB in flat_map implementation when the implementation
has a movable std::pair
--- a/boost/container/allocator_traits.hpp
+++ b/boost/container/allocator_traits.hpp
@@ -32,6 +32,8 @@
#include <boost/container/detail/mpl.hpp>
#include <boost/container/detail/type_traits.hpp> //is_empty
#include <boost/container/detail/placement_new.hpp>
+#include <boost/container/detail/is_pair.hpp>
+#include <boost/container/detail/addressof.hpp>
#ifndef BOOST_CONTAINER_DETAIL_STD_FWD_HPP
#include <boost/container/detail/std_fwd.hpp>
#endif
@@ -81,6 +83,144 @@
namespace boost {
namespace container {
+namespace dtl {
+
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+
+template<class T, class ...Args>
+BOOST_CONTAINER_FORCEINLINE void construct_type(T *p, BOOST_FWD_REF(Args) ...args)
+{
+ ::new((void*)p, boost_container_new_t()) T(::boost::forward<Args>(args)...);
+}
+
+template < class Pair, class KeyType, class ... Args>
+typename dtl::enable_if< dtl::is_pair<Pair>, void >::type
+construct_type
+ (Pair* p, try_emplace_t, BOOST_FWD_REF(KeyType) k, BOOST_FWD_REF(Args) ...args)
+{
+ construct_type(dtl::addressof(p->first), ::boost::forward<KeyType>(k));
+ BOOST_CONTAINER_TRY{
+ construct_type(dtl::addressof(p->second), ::boost::forward<Args>(args)...);
+ }
+ BOOST_CONTAINER_CATCH(...) {
+ typedef typename Pair::first_type first_type;
+ dtl::addressof(p->first)->~first_type();
+ BOOST_CONTAINER_RETHROW
+ }
+ BOOST_CONTAINER_CATCH_END
+}
+
+#else
+
+#define BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPEJ(N) \
+template<class T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N>\
+BOOST_CONTAINER_FORCEINLINE \
+ typename dtl::disable_if_c<dtl::is_pair<T>::value, void >::type \
+construct_type(T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+{\
+ ::new((void*)p, boost_container_new_t()) T( BOOST_MOVE_FWD##N );\
+}\
+//
+BOOST_MOVE_ITERATE_0TO8(BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPEJ)
+#undef BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPEJ
+
+#define BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPE(N) \
+template < class Pair, class KeyType BOOST_MOVE_I##N BOOST_MOVE_CLASS##N>\
+typename dtl::enable_if< dtl::is_pair<Pair>, void >::type construct_type\
+ (Pair* p, try_emplace_t, BOOST_FWD_REF(KeyType) k BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+{\
+ construct_type(dtl::addressof(p->first), ::boost::forward<KeyType>(k));\
+ BOOST_CONTAINER_TRY{\
+ construct_type(dtl::addressof(p->second) BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
+ }\
+ BOOST_CONTAINER_CATCH(...) {\
+ typedef typename Pair::first_type first_type;\
+ dtl::addressof(p->first)->~first_type();\
+ BOOST_CONTAINER_RETHROW\
+ }\
+ BOOST_CONTAINER_CATCH_END\
+}\
+//
+BOOST_MOVE_ITERATE_0TO8(BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPE)
+#undef BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPE
+
+#endif
+
+template<class T>
+inline
+typename dtl::enable_if<dtl::is_pair<T>, void >::type
+construct_type(T* p)
+{
+ dtl::construct_type(dtl::addressof(p->first));
+ BOOST_CONTAINER_TRY{
+ dtl::construct_type(dtl::addressof(p->second));
+ }
+ BOOST_CONTAINER_CATCH(...) {
+ typedef typename T::first_type first_type;
+ dtl::addressof(p->first)->~first_type();
+ BOOST_CONTAINER_RETHROW
+ }
+ BOOST_CONTAINER_CATCH_END
+}
+
+
+template<class T, class U>
+inline
+typename dtl::enable_if_c
+ < dtl::is_pair<T>::value
+ , void >::type
+construct_type(T* p, U &u)
+{
+ dtl::construct_type(dtl::addressof(p->first), u.first);
+ BOOST_CONTAINER_TRY{
+ dtl::construct_type(dtl::addressof(p->second), u.second);
+ }
+ BOOST_CONTAINER_CATCH(...) {
+ typedef typename T::first_type first_type;
+ dtl::addressof(p->first)->~first_type();
+ BOOST_CONTAINER_RETHROW
+ }
+ BOOST_CONTAINER_CATCH_END
+}
+
+template<class T, class U>
+inline
+typename dtl::enable_if_c
+ < dtl::is_pair<typename dtl::remove_reference<T>::type>::value &&
+ !boost::move_detail::is_reference<U>::value //This is needed for MSVC10 and ambiguous overloads
+ , void >::type
+construct_type(T* p, BOOST_RV_REF(U) u)
+{
+ dtl::construct_type(dtl::addressof(p->first), ::boost::move(u.first));
+ BOOST_CONTAINER_TRY{
+ dtl::construct_type(dtl::addressof(p->second), ::boost::move(u.second));
+ }
+ BOOST_CONTAINER_CATCH(...) {
+ typedef typename T::first_type first_type;
+ dtl::addressof(p->first)->~first_type();
+ BOOST_CONTAINER_RETHROW
+ }
+ BOOST_CONTAINER_CATCH_END
+}
+
+template<class T, class U, class V>
+inline
+typename dtl::enable_if<dtl::is_pair<T>, void >::type
+construct_type(T* p, BOOST_FWD_REF(U) x, BOOST_FWD_REF(V) y)
+{
+ dtl::construct_type(dtl::addressof(p->first), ::boost::forward<U>(x));
+ BOOST_CONTAINER_TRY{
+ dtl::construct_type(dtl::addressof(p->second), ::boost::forward<V>(y));
+ }
+ BOOST_CONTAINER_CATCH(...) {
+ typedef typename T::first_type first_type;
+ dtl::addressof(p->first)->~first_type();
+ BOOST_CONTAINER_RETHROW
+ }
+ BOOST_CONTAINER_CATCH_END
+}
+
+} //namespace dtl
#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -419,7 +559,7 @@ struct allocator_traits
template<class T, class ...Args>
inline static void priv_construct(dtl::false_type, Allocator &, T *p, BOOST_FWD_REF(Args) ...args)
- { ::new((void*)p, boost_container_new_t()) T(::boost::forward<Args>(args)...); }
+ { dtl::construct_type(p, ::boost::forward<Args>(args)...); }
#else // #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
public:
@@ -450,7 +590,7 @@ struct allocator_traits
\
template<class T BOOST_MOVE_I##N BOOST_MOVE_CLASS##N >\
inline static void priv_construct(dtl::false_type, Allocator &, T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
- { ::new((void*)p, boost_container_new_t()) T(BOOST_MOVE_FWD##N); }\
+ { dtl::construct_type(p BOOST_MOVE_I##N BOOST_MOVE_FWD##N); }\
//
BOOST_MOVE_ITERATE_0TO8(BOOST_CONTAINER_ALLOCATOR_TRAITS_PRIV_CONSTRUCT_IMPL)
#undef BOOST_CONTAINER_ALLOCATOR_TRAITS_PRIV_CONSTRUCT_IMPL
--- a/boost/container/detail/construct_in_place.hpp
+++ b/boost/container/detail/construct_in_place.hpp
@@ -24,6 +24,7 @@
#include <boost/container/allocator_traits.hpp>
#include <boost/container/detail/iterators.hpp>
#include <boost/container/detail/value_init.hpp>
+#include <boost/container/detail/is_pair.hpp>
namespace boost {
namespace container {
@@ -62,9 +63,42 @@ BOOST_CONTAINER_FORCEINLINE void construct_in_place(Allocator &a, T *dest, empla
//Assignment
+template<class T, class U>
+BOOST_CONTAINER_FORCEINLINE
+ typename dtl::disable_if_c
+ < dtl::is_pair<typename dtl::remove_reference<T>::type>::value
+ && dtl::is_pair<typename dtl::remove_reference<U>::type>::value
+ , void>::type
+assign_in_place_ref(T &t, BOOST_FWD_REF(U) u)
+{ t = ::boost::forward<U>(u); }
+
+template<class T, class U>
+BOOST_CONTAINER_FORCEINLINE
+ typename dtl::enable_if_c
+ < dtl::is_pair<typename dtl::remove_reference<T>::type>::value
+ && dtl::is_pair<typename dtl::remove_reference<U>::type>::value
+ , void>::type
+assign_in_place_ref(T &t, const U &u)
+{
+ assign_in_place_ref(t.first, u.first);
+ assign_in_place_ref(t.second, u.second);
+}
+
+template<class T, class U>
+BOOST_CONTAINER_FORCEINLINE
+ typename dtl::enable_if_c
+ < dtl::is_pair<typename dtl::remove_reference<T>::type>::value
+ && dtl::is_pair<typename dtl::remove_reference<U>::type>::value
+ , void>::type
+assign_in_place_ref(T &t, BOOST_RV_REF(U) u)
+{
+ assign_in_place_ref(t.first, ::boost::move(u.first));
+ assign_in_place_ref(t.second, ::boost::move(u.second));
+}
+
template<class DstIt, class InpIt>
BOOST_CONTAINER_FORCEINLINE void assign_in_place(DstIt dest, InpIt source)
-{ *dest = *source; }
+{ assign_in_place_ref(*dest, *source); }
template<class DstIt, class U>
BOOST_CONTAINER_FORCEINLINE void assign_in_place(DstIt dest, value_init_construct_iterator<U>)
--- a/boost/container/flat_map.hpp
+++ b/boost/container/flat_map.hpp
@@ -48,6 +48,11 @@
#include <initializer_list>
#endif
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#define BOOST_CONTAINER_STD_PAIR_IS_MOVABLE
+#endif
+
+
namespace boost {
namespace container {
@@ -58,21 +63,37 @@ class flat_multimap;
namespace dtl{
+#if defined(BOOST_CONTAINER_STD_PAIR_IS_MOVABLE)
template<class D, class S>
BOOST_CONTAINER_FORCEINLINE static D &force(S &s)
-{ return *move_detail::force_ptr<D*>(&s); }
+{ return s; }
template<class D, class S>
BOOST_CONTAINER_FORCEINLINE static const D &force(const S &s)
-{ return *move_detail::force_ptr<const D*>(&s); }
+{ return s; }
+
+template<class D>
+BOOST_CONTAINER_FORCEINLINE static D force_copy(D s)
+{ return s; }
+
+#else //!BOOST_CONTAINER_DOXYGEN_INVOKED
+
+template<class D, class S>
+BOOST_CONTAINER_FORCEINLINE static D &force(S &s)
+{ return *move_detail::launder_cast<D*>(&s); }
+
+template<class D, class S>
+BOOST_CONTAINER_FORCEINLINE static const D &force(const S &s)
+{ return *move_detail::launder_cast<const D*>(&s); }
template<class D, class S>
BOOST_CONTAINER_FORCEINLINE static D force_copy(const S &s)
{
- const D *const vp = move_detail::force_ptr<const D *>(&s);
+ const D *const vp = move_detail::launder_cast<const D *>(&s);
D ret_val(*vp);
return ret_val;
}
+#endif //BOOST_CONTAINER_DOXYGEN_INVOKED
} //namespace dtl{
@@ -118,18 +139,27 @@ class flat_map
private:
BOOST_COPYABLE_AND_MOVABLE(flat_map)
//This is the tree that we should store if pair was movable
+ typedef std::pair<Key, T> std_pair_t;
typedef dtl::flat_tree<
- std::pair<Key, T>,
+ std_pair_t,
dtl::select1st<Key>,
Compare,
AllocatorOrContainer> tree_t;
//This is the real tree stored here. It's based on a movable pair
+ typedef dtl::pair<Key, T> dtl_pair_t;
+
+ #ifdef BOOST_CONTAINER_STD_PAIR_IS_MOVABLE
+ typedef std_pair_t impl_pair_t;
+ #else
+ typedef dtl_pair_t impl_pair_t;
+ #endif
+
typedef dtl::flat_tree<
- dtl::pair<Key, T>,
+ impl_pair_t,
dtl::select1st<Key>,
Compare,
- typename dtl::container_or_allocator_rebind<AllocatorOrContainer, dtl::pair<Key, T> >::type
+ typename dtl::container_or_allocator_rebind<AllocatorOrContainer, impl_pair_t >::type
> impl_tree_t;
impl_tree_t m_flat_tree; // flat tree representing flat_map
@@ -851,7 +881,7 @@ class flat_map
//! @copydoc ::boost::container::flat_set::nth(size_type) const
BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
- { return dtl::force_copy<iterator>(m_flat_tree.nth(n)); }
+ { return dtl::force_copy<const_iterator>(m_flat_tree.nth(n)); }
//! @copydoc ::boost::container::flat_set::index_of(iterator)
BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
@@ -1099,7 +1129,7 @@ class flat_map
template <class Pair>
inline BOOST_CONTAINER_DOC1ST
( std::pair<iterator BOOST_MOVE_I bool>
- , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I impl_value_type>::value
+ , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I dtl_pair_t>::value
BOOST_MOVE_I std::pair<iterator BOOST_MOVE_I bool> >::type)
insert(BOOST_FWD_REF(Pair) x)
{
@@ -1153,7 +1183,7 @@ class flat_map
template <class Pair>
inline BOOST_CONTAINER_DOC1ST
( iterator
- , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I impl_value_type>::value
+ , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I dtl_pair_t>::value
BOOST_MOVE_I iterator>::type)
insert(const_iterator p, BOOST_FWD_REF(Pair) x)
{
@@ -1777,17 +1807,24 @@ class flat_multimap
#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
private:
BOOST_COPYABLE_AND_MOVABLE(flat_multimap)
+ typedef std::pair<Key, T> std_pair_t;
typedef dtl::flat_tree<
- std::pair<Key, T>,
+ std_pair_t,
dtl::select1st<Key>,
Compare,
AllocatorOrContainer> tree_t;
//This is the real tree stored here. It's based on a movable pair
+ typedef dtl::pair<Key, T> dtl_pair_t;
+ #ifdef BOOST_CONTAINER_STD_PAIR_IS_MOVABLE
+ typedef std_pair_t impl_pair_t;
+ #else
+ typedef dtl_pair_t impl_pair_t;
+ #endif
typedef dtl::flat_tree<
- dtl::pair<Key, T>,
+ impl_pair_t,
dtl::select1st<Key>,
Compare,
- typename dtl::container_or_allocator_rebind<AllocatorOrContainer, dtl::pair<Key, T> >::type
+ typename dtl::container_or_allocator_rebind<AllocatorOrContainer, impl_pair_t >::type
> impl_tree_t;
impl_tree_t m_flat_tree; // flat tree representing flat_map
@@ -2388,7 +2425,7 @@ class flat_multimap
//! @copydoc ::boost::container::flat_set::nth(size_type) const
BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
- { return dtl::force_copy<iterator>(m_flat_tree.nth(n)); }
+ { return dtl::force_copy<const_iterator>(m_flat_tree.nth(n)); }
//! @copydoc ::boost::container::flat_set::index_of(iterator)
BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
@@ -2477,7 +2514,7 @@ class flat_multimap
template<class Pair>
inline BOOST_CONTAINER_DOC1ST
( iterator
- , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I impl_value_type>::value
+ , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I dtl_pair_t>::value
BOOST_MOVE_I iterator >::type)
insert(BOOST_FWD_REF(Pair) x)
{ return dtl::force_copy<iterator>(m_flat_tree.emplace_equal(boost::forward<Pair>(x))); }
@@ -2514,7 +2551,7 @@ class flat_multimap
template<class Pair>
inline BOOST_CONTAINER_DOC1ST
( iterator
- , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I impl_value_type>::value
+ , typename dtl::enable_if_c<dtl::is_convertible<Pair BOOST_MOVE_I dtl_pair_t>::value
BOOST_MOVE_I iterator>::type)
insert(const_iterator p, BOOST_FWD_REF(Pair) x)
{