FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libstdc++/68139 (rethrow_if_nested should tolerate overloaded unary operator&)

Browse source 
PR libstdc++/68139

From-SVN: r231562
This commit is contained in:
Ville Voutilainen 2015-12-11 14:04:23 +02:00 • committed by Ville Voutilainen
parent 7d3015e850
commit e3fc446b9c
3 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,10 @@
2015-12-11 Ville Voutilainen <ville.voutilainen@gmail.com>
PR libstdc++/68139
* libsupc++/nested_exception.h (_S_rethrow): Use std::__addressof.
* testsuite/18_support/nested_exception/68139.cc: New.
2015-12-10 Jonathan Wakely <jwakely@redhat.com> 2015-12-10 Jonathan Wakely <jwakely@redhat.com>
* testsuite/experimental/memory/shared_ptr/assign/assign.cc: Replace * testsuite/experimental/memory/shared_ptr/assign/assign.cc: Replace

4
libstdc++-v3/libsupc++/nested_exception.h
View file

@ -37,6 +37,7 @@
#else #else
#include <bits/c++config.h> #include <bits/c++config.h>
#include <bits/move.h>
#if ATOMIC_INT_LOCK_FREE < 2 #if ATOMIC_INT_LOCK_FREE < 2
# error This platform does not support exception propagation. # error This platform does not support exception propagation.
@ -142,7 +143,8 @@ namespace std
{ {
static void _S_rethrow(const _Tp& __t) static void _S_rethrow(const _Tp& __t)
{ {
if (auto __tp = dynamic_cast<const nested_exception*>(&__t)) if (auto __tp =
dynamic_cast<const nested_exception*>(std::__addressof(__t)))
__tp->rethrow_nested(); __tp->rethrow_nested();
} }
}; };

31
libstdc++-v3/testsuite/18_support/nested_exception/68139.cc Normal file
View file

@ -0,0 +1,31 @@
// { dg-do compile }
// { dg-options "-std=gnu++11" }
// { dg-require-atomic-builtins "" }
// 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/>.
#include <exception>
// libstdc++/68139
struct C {
virtual ~C(){}
void operator&() const = delete;
};
int main() { std::rethrow_if_nested(C()); }