diff options
| author | Ville Voutilainen <ville.voutilainen@gmail.com> | 2015-12-11 14:04:23 +0200 |
|---|---|---|
| committer | Ville Voutilainen <ville@gcc.gnu.org> | 2015-12-11 14:04:23 +0200 |
| commit | e3fc446b9cc1e8a168d41b14782f40031af89e57 (patch) | |
| tree | 172f7457c7f33fe04227fbf6aa7dc964851b90b0 | |
| parent | 7d3015e8508778f6c07097d0e082c6ef1476c6d1 (diff) | |
| download | gcc-e3fc446b9cc1e8a168d41b14782f40031af89e57.zip gcc-e3fc446b9cc1e8a168d41b14782f40031af89e57.tar.gz gcc-e3fc446b9cc1e8a168d41b14782f40031af89e57.tar.bz2 | |
re PR libstdc++/68139 (rethrow_if_nested should tolerate overloaded unary operator&)
PR libstdc++/68139
From-SVN: r231562
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/nested_exception.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/18_support/nested_exception/68139.cc | 31 |
3 files changed, 41 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3fc7f57..f982946 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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> * testsuite/experimental/memory/shared_ptr/assign/assign.cc: Replace diff --git a/libstdc++-v3/libsupc++/nested_exception.h b/libstdc++-v3/libsupc++/nested_exception.h index a716f75..82b95df 100644 --- a/libstdc++-v3/libsupc++/nested_exception.h +++ b/libstdc++-v3/libsupc++/nested_exception.h @@ -37,6 +37,7 @@ #else #include <bits/c++config.h> +#include <bits/move.h> #if ATOMIC_INT_LOCK_FREE < 2 # error This platform does not support exception propagation. @@ -142,7 +143,8 @@ namespace std { 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(); } }; diff --git a/libstdc++-v3/testsuite/18_support/nested_exception/68139.cc b/libstdc++-v3/testsuite/18_support/nested_exception/68139.cc new file mode 100644 index 0000000..551f931 --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/nested_exception/68139.cc @@ -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()); } + |