diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc index 42dfa6a37aedefe05c5206e1ffc454cbc95704ae..fcbecca55b4fce62c88fae70833164226b7678a3 100644 --- a/libstdc++-v3/include/bits/deque.tcc +++ b/libstdc++-v3/include/bits/deque.tcc @@ -200,8 +200,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return __tmp; } else - return _M_insert_aux(__position._M_const_cast(), - std::forward<_Args>(__args)...); + return _M_emplace_aux(__position._M_const_cast(), + std::forward<_Args>(__args)...); } #endif @@ -646,7 +646,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER template<typename... _Args> typename deque<_Tp, _Alloc>::iterator deque<_Tp, _Alloc>:: - _M_insert_aux(iterator __pos, _Args&&... __args) + _M_emplace_aux(iterator __pos, _Args&&... __args) { value_type __x_copy(std::forward<_Args>(__args)...); // XXX copy #else diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h index 225fac36e2bf4e9132beaf785e252df5fa845e55..69367140c8e7bb78f9491d15bbdc2bce703dbeaf 100644 --- a/libstdc++-v3/include/bits/stl_deque.h +++ b/libstdc++-v3/include/bits/stl_deque.h @@ -2059,9 +2059,13 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER iterator _M_insert_aux(iterator __pos, const value_type& __x); #else + iterator + _M_insert_aux(iterator __pos, const value_type& __x) + { return _M_emplace_aux(__pos, __x); } + template<typename... _Args> iterator - _M_insert_aux(iterator __pos, _Args&&... __args); + _M_emplace_aux(iterator __pos, _Args&&... __args); #endif // called by insert(p,n,x) via fill_insert diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/90389.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/90389.cc new file mode 100644 index 0000000000000000000000000000000000000000..b4932498700b1686a1e5a25eb4ca5121407ec670 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/90389.cc @@ -0,0 +1,43 @@ +// { dg-do run { target c++11 } } + +// Bug 90389 - std::deque::emplace tries to call wrong overload internally + +#include <deque> +#include <testsuite_hooks.h> + +struct X +{ + X() = default; + X(void*, void*, std::size_t) { } +}; + +void +test_pr90389() +{ + const int n = 3; + std::deque<X> d(n); + d.emplace(d.begin(), nullptr, nullptr, d.size()); + VERIFY( d.size() == n+1 ); +} + +struct Y +{ + Y() = default; + Y(std::size_t, const Y&) { } +}; + +void +test_pr118079() +{ + const int n = 3; + std::deque<Y> d(n); + const Y y{}; + d.emplace(d.begin(), d.size(), y); + VERIFY( d.size() == n+1 ); +} + +int main() +{ + test_pr90389(); + test_pr118079(); +}