aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-22 16:05:04 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-22 16:05:04 +0000
commitdb5346ecbc766bcc4cf66ca2f6d5d5c89f628bbc (patch)
tree6af3366e1417623ce3230113167bfeeaef14d1a1
parent81b38777cbabae19c0006036c61195a32bfde513 (diff)
PR c++/56071
* pt.c (maybe_instantiate_noexcept): Don't defer access checks. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195378 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/pt.c2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/noexcept20.C22
3 files changed, 29 insertions, 0 deletions
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 <jason@redhat.com>
+
+ PR c++/56071
+ * pt.c (maybe_instantiate_noexcept): Don't defer access checks.
+
2013-01-22 Dodji Seketeli <dodji@redhat.com>
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 <typename T> friend struct A;
+ B() {}
+};
+
+template <typename T>
+struct A
+{
+ A() noexcept(noexcept(B())) { }
+};
+
+struct C
+{
+ C()
+ {
+ static_assert( !noexcept(A<int>()), "" );
+ }
+};