From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 3 Sep 2018 14:25:29 +0000 (+0100)
Subject: Fix vector::_Temporary_value::_M_ptr
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7efe0dd0b43db1ac5070908290a3febfcfb73513;p=gcc.git

Fix vector::_Temporary_value::_M_ptr

The pointer argument to allocator_traits::construct and
allocator_traits::destroy should be a raw pointer, not the allocator's
pointer type. _Temporary_value::_M_ptr was returning the wrong type.

	* include/bits/stl_vector.h (vector::_Temporary_value::_M_ptr):
	Return raw pointer not allocator's pointer type.
	(vector::_Temporary_value::_M_val): Use _M_ptr.

From-SVN: r264061
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6a576baeed5..9fddb1e9ee0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
 2018-09-03  Jonathan Wakely  <jwakely@redhat.com>
 
+	* include/bits/stl_vector.h (vector::_Temporary_value::_M_ptr):
+	Return raw pointer not allocator's pointer type.
+	(vector::_Temporary_value::_M_val): Use _M_ptr.
+
 	PR libstdc++/87194
 	* include/bits/stl_map.h
 	(map::map(initializer_list<value_type>, const Compare&, const Alloc&))
diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h
index 6bb75b7f8fd..47856473107 100644
--- a/libstdc++-v3/include/bits/stl_vector.h
+++ b/libstdc++-v3/include/bits/stl_vector.h
@@ -1667,11 +1667,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 	{ _Alloc_traits::destroy(_M_this->_M_impl, _M_ptr()); }
 
 	value_type&
-	_M_val() { return *reinterpret_cast<_Tp*>(&__buf); }
+	_M_val() { return *_M_ptr(); }
 
       private:
-	pointer
-	_M_ptr() { return pointer_traits<pointer>::pointer_to(_M_val()); }
+	_Tp*
+	_M_ptr() { return reinterpret_cast<_Tp*>(&__buf); }
 
 	vector* _M_this;
 	typename aligned_storage<sizeof(_Tp), alignof(_Tp)>::type __buf;