diff options
| author | Jason Merrill <jason@redhat.com> | 2013-02-11 10:47:46 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2013-02-11 10:47:46 -0500 |
| commit | ba9146c16bc6a7f3539e4cef5f5a9a8207de66ad (patch) | |
| tree | 5105e6f42180260efa04a494310401106c8b3e5e | |
| parent | e77439af649673f35b9fea054c8a9c13d4162588 (diff) | |
| download | gcc-ba9146c16bc6a7f3539e4cef5f5a9a8207de66ad.zip gcc-ba9146c16bc6a7f3539e4cef5f5a9a8207de66ad.tar.gz gcc-ba9146c16bc6a7f3539e4cef5f5a9a8207de66ad.tar.bz2 | |
re PR c++/56268 (C++11 ICE with boost multi-precision and boost variant during assignment)
PR c++/56268
* semantics.c (classtype_has_nothrow_assign_or_copy_p): Call
maybe_instantiate_noexcept.
From-SVN: r195943
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/has_nothrow_copy-8.C | 19 |
3 files changed, 24 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c1fc4bc..6172db6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2013-02-09 Jason Merrill <jason@redhat.com> + PR c++/56268 + * semantics.c (classtype_has_nothrow_assign_or_copy_p): Call + maybe_instantiate_noexcept. + PR c++/56247 * pt.c (eq_specializations): Set comparing_specializations. * tree.c (cp_tree_equal): Check it. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index f8b37c1..e3dea09 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -5413,6 +5413,7 @@ classtype_has_nothrow_assign_or_copy_p (tree type, bool assign_p) else if (copy_fn_p (fn) <= 0) continue; + maybe_instantiate_noexcept (fn); if (!TYPE_NOTHROW_P (TREE_TYPE (fn))) return false; } diff --git a/gcc/testsuite/g++.dg/ext/has_nothrow_copy-8.C b/gcc/testsuite/g++.dg/ext/has_nothrow_copy-8.C new file mode 100644 index 0000000..e1be1a0 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/has_nothrow_copy-8.C @@ -0,0 +1,19 @@ +// PR c++/56268 +// { dg-options -std=c++11 } + +template <class T> +struct A { + A(const A&) noexcept (T::value); +}; + +struct B { + static const bool value = true; +}; + +template <class T> +struct C { + static const bool value = __has_nothrow_copy (T); +}; + +#define SA(X) static_assert((X),#X) +SA(C<A<B>>::value); |