git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libstdc++/57350 (std::align missing) 

PR libstdc++/57350
	* include/std/memory (align): Do not adjust correctly aligned address.
	* testsuite/20_util/align/2.cc: New.

From-SVN: r216149
This commit is contained in:
Jonathan Wakely 2014-10-13 15:08:44 +01:00 committed by Jonathan Wakely
parent 270cc99ec8
commit 01d6452fe5
3 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2014-10-13 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/57350
* include/std/memory (align): Do not adjust correctly aligned address.
* testsuite/20_util/align/2.cc: New.
2014-10-13 Siva Chandra Reddy <sivachandra@google.com> 2014-10-13 Siva Chandra Reddy <sivachandra@google.com>
* python/libstdcxx/v6/xmethods.py: Add xmethods for std::array, * python/libstdcxx/v6/xmethods.py: Add xmethods for std::array,

9
libstdc++-v3/include/std/memory
View File

@ -113,14 +113,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
inline void* inline void*
align(size_t __align, size_t __size, void*& __ptr, size_t& __space) noexcept align(size_t __align, size_t __size, void*& __ptr, size_t& __space) noexcept
{ {
const size_t __diff = __align - reinterpret_cast<uintptr_t>(__ptr) % __align; const auto __intptr = reinterpret_cast<uintptr_t>(__ptr);
if (__diff + __size >= __space) const auto __aligned = (__intptr - 1u + __align) & -__align;
const auto __diff = __aligned - __intptr;
if ((__size + __diff) > __space)
return nullptr; return nullptr;
else else
{ {
__space -= __diff; __space -= __diff;
__ptr = static_cast<char*>(__ptr) + __diff; return __ptr = reinterpret_cast<void*>(__aligned);
return __ptr;
} }
} }

42
libstdc++-v3/testsuite/20_util/align/2.cc Normal file
View File

@ -0,0 +1,42 @@
// { dg-options " -std=gnu++11 " }
// Copyright (C) 2014 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/>.
// C++11 [ptr.align] (20.6.5): std::align
#include <memory>
#include <testsuite_hooks.h>
void
test01()
{
bool test __attribute__((unused)) = true;
int i = 0;
void* ptr = &i;
auto space = sizeof(i);
auto p2 = std::align(alignof(i), space, ptr, space);
VERIFY( ptr == &i );
VERIFY( p2 == &i );
VERIFY(space == sizeof(i));
}
int main()
{
test01();
}