From 904812578d14a5f06cd294b5398e8bb2a237c031 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 22 Jan 2013 11:05:04 -0500 Subject: [PATCH] re PR c++/56071 (friend class template cannot access private constructor in exception-specification) PR c++/56071 * pt.c (maybe_instantiate_noexcept): Don't defer access checks. From-SVN: r195378 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 2 ++ gcc/testsuite/g++.dg/cpp0x/noexcept20.C | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/noexcept20.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b9f68fe0e67..7da2b4aa569 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2013-01-22 Jason Merrill + + PR c++/56071 + * pt.c (maybe_instantiate_noexcept): Don't defer access checks. + 2013-01-22 Dodji Seketeli PR c++/53609 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index e38aca61a6c..01d42959754 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -18429,12 +18429,14 @@ maybe_instantiate_noexcept (tree fn) if (push_tinst_level (fn)) { push_access_scope (fn); + push_deferring_access_checks (dk_no_deferred); input_location = DECL_SOURCE_LOCATION (fn); noex = tsubst_copy_and_build (DEFERRED_NOEXCEPT_PATTERN (noex), DEFERRED_NOEXCEPT_ARGS (noex), tf_warning_or_error, fn, /*function_p=*/false, /*integral_constant_expression_p=*/true); + pop_deferring_access_checks (); pop_access_scope (fn); pop_tinst_level (); spec = build_noexcept_spec (noex, tf_warning_or_error); diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept20.C b/gcc/testsuite/g++.dg/cpp0x/noexcept20.C new file mode 100644 index 00000000000..b86760292b3 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/noexcept20.C @@ -0,0 +1,22 @@ +// PR c++/56071 +// { dg-options -std=c++11 } + +class B +{ + template friend struct A; + B() {} +}; + +template +struct A +{ + A() noexcept(noexcept(B())) { } +}; + +struct C +{ + C() + { + static_assert( !noexcept(A()), "" ); + } +}; -- 2.30.2