re PR c++/47336 ([C++0x] ICE: "Error reporting routines re-entered")

	PR c++/47336
	* error.c (dump_template_bindings): Suppress access control.

From-SVN: r174072

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f4f04f20f0f462394ed46282fc00061cb5f5ea68..4b0b3a12946187388565f4d9d3b2f0e4f3418e89 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-23  Jason Merrill  <jason@redhat.com>
 
+       PR c++/47336
+       * error.c (dump_template_bindings): Suppress access control.
+
        PR c++/47544
        * pt.c (instantiate_decl): Handle =default.
 

diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index e580fd92158df4bf180cfbbcdc663015a8f9cf8c..a6648cc664761cb120d97258f15f487b2e16afbc 100644 (file)
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -313,7 +313,9 @@ dump_template_bindings (tree parms, tree args, VEC(tree,gc)* typenames)
       pp_cxx_whitespace (cxx_pp);
       pp_equal (cxx_pp);
       pp_cxx_whitespace (cxx_pp);
+      push_deferring_access_checks (dk_no_check);
       t = tsubst (t, args, tf_none, NULL_TREE);
+      pop_deferring_access_checks ();
       /* Strip typedefs.  We can't just use TFF_CHASE_TYPEDEF because
         pp_simple_type_specifier doesn't know about it.  */
       t = strip_typedefs (t);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3c18295fa6de1183e07010296594a96d0bbf50d2..ac13fe55c3d010f846c605bb8555483e7432c534 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2011-05-23  Jason Merrill  <jason@redhat.com>
 
+       * g++.dg/cpp0x/error3.C: New.
+
        * g++.dg/cpp0x/defaulted27.C: New.
 
        * g++.dg/cpp0x/decltype27.C: New.

diff --git a/gcc/testsuite/g++.dg/cpp0x/error3.C b/gcc/testsuite/g++.dg/cpp0x/error3.C
new file mode 100644 (file)
index 0000000..e7da961
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/error3.C
@@ -0,0 +1,24 @@
+// PR c++/47336
+// { dg-options -std=c++0x }
+
+template <typename T>
+void g(T t)
+{
+  t+1;                         // { dg-error "no match" }
+}
+
+template <typename S>
+class C
+{
+  struct D {} d;
+public:
+  decltype(g(d)) h()
+  {
+    return g(d);
+  }
+};
+
+int main()
+{
+  C<int>().h();
+}