diff options
| author | Jason Merrill <jason@redhat.com> | 2011-05-23 11:32:29 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-05-23 11:32:29 -0400 |
| commit | 42d1e31d0f0352009d851f52a9cfd5273ad303f8 (patch) | |
| tree | ac99875ae45a6493cedb0c8c84381cd3c74b8b7d /gcc | |
| parent | 6474197358539b140410d020b0898b4bd30c2252 (diff) | |
| download | gcc-42d1e31d0f0352009d851f52a9cfd5273ad303f8.zip gcc-42d1e31d0f0352009d851f52a9cfd5273ad303f8.tar.gz gcc-42d1e31d0f0352009d851f52a9cfd5273ad303f8.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/error.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/error3.C | 24 |
4 files changed, 31 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f4f04f2..4b0b3a1 100644 --- 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 e580fd9..a6648cc 100644 --- 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 3c18295..ac13fe5 100644 --- 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 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(); +} |