OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

any (any::_Storage): Fix alignment of buffer.

Browse Source 
* include/experimental/any (any::_Storage): Fix alignment of buffer.
	(any::_Internal): Check alignment of type.
	* testsuite/experimental/any/cons/aligned.cc: New.
	* testsuite/experimental/any/misc/any_cast_neg.cc: Adjust dg-error.

From-SVN: r222729
This commit is contained in:
Jonathan Wakely 2015-05-02 19:19:39 +01:00 committed by Jonathan Wakely
parent b4f504de77
commit 563777d7fc
4 changed files with 61 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,10 @@
2015-05-02 Jonathan Wakely <jwakely@redhat.com>
* include/experimental/any (any::_Storage): Fix alignment of buffer.
(any::_Internal): Check alignment of type.
* testsuite/experimental/any/cons/aligned.cc: New.
* testsuite/experimental/any/misc/any_cast_neg.cc: Adjust dg-error.
* include/experimental/iterator (ostream_joiner): Simplify by using
the injected-class-name and the ostream_type typedef.

5
libstdc++-v3/include/experimental/any
View File

@ -98,11 +98,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Storage& operator=(const _Storage&) = delete;
void* _M_ptr;
std::aligned_storage<sizeof(_M_ptr), sizeof(_M_ptr)>::type _M_buffer;
aligned_storage<sizeof(_M_ptr), alignof(void*)>::type _M_buffer;
};
template<typename _Tp, typename _Safe = is_nothrow_move_constructible<_Tp>,
bool _Fits = (sizeof(_Tp) <= sizeof(_Storage))>
bool _Fits = (sizeof(_Tp) <= sizeof(_Storage))
&& (alignof(_Tp) <= alignof(_Storage))>
using _Internal = std::integral_constant<bool, _Safe::value && _Fits>;
template<typename _Tp>

52
libstdc++-v3/testsuite/experimental/any/cons/aligned.cc Normal file
View File

@ -0,0 +1,52 @@
// Copyright (C) 2015 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++14" }
#include <experimental/any>
#include <cstdint>
#include <testsuite_hooks.h>
// Alignment requiremnts of this type prevent it being stored in 'any'
struct alignas(2 * alignof(void*)) X { };
bool
stored_internally(void* obj, const std::experimental::any& a)
{
std::uintptr_t a_addr = reinterpret_cast<std::uintptr_t>(&a);
std::uintptr_t a_end = a_addr + sizeof(a);
std::uintptr_t obj_addr = reinterpret_cast<std::uintptr_t>(obj);
return (a_addr <= obj_addr) && (obj_addr < a_end);
}
void
test01()
{
std::experimental::any a = X{};
X& x = std::experimental::any_cast<X&>(a);
VERIFY( !stored_internally(&x, a) );
a = 'X';
char& c = std::experimental::any_cast<char&>(a);
VERIFY( stored_internally(&c, a) );
}
int
main()
{
test01();
}

2
libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc
View File

@ -26,5 +26,5 @@ void test01()
using std::experimental::any_cast;
const any y(1);
any_cast<int&>(y); // { dg-error "qualifiers" "" { target { *-*-* } } 355 }
any_cast<int&>(y); // { dg-error "qualifiers" "" { target { *-*-* } } 356 }
}