diff options
| author | Jason Merrill <jason@redhat.com> | 2014-02-24 13:47:20 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-02-24 13:47:20 -0500 |
| commit | 016895178d73bf9e4b0dea6ed253adea4f9af4f9 (patch) | |
| tree | e39f9bfa091be6b987210b666a42be5452f1d41c /gcc | |
| parent | ad43b47a25f5c4cf66b8604e37e696b7f94a4e0e (diff) | |
| download | gcc-016895178d73bf9e4b0dea6ed253adea4f9af4f9.zip gcc-016895178d73bf9e4b0dea6ed253adea4f9af4f9.tar.gz gcc-016895178d73bf9e4b0dea6ed253adea4f9af4f9.tar.bz2 | |
re PR c++/60312 ([c++1y] ICE using auto as template parameter)
PR c++/60312
* parser.c (cp_parser_template_type_arg): Check for invalid 'auto'.
From-SVN: r208092
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/auto-neg1.C | 16 |
3 files changed, 26 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1b204dc..5369ee6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-02-24 Jason Merrill <jason@redhat.com> + + PR c++/60312 + * parser.c (cp_parser_template_type_arg): Check for invalid 'auto'. + 2014-02-21 Jason Merrill <jason@redhat.com> PR c++/58170 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 1e98032..d99dff0 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -18005,6 +18005,11 @@ static tree cp_parser_template_type_arg (cp_parser *parser) = G_("types may not be defined in template arguments"); r = cp_parser_type_id_1 (parser, true, false); parser->type_definition_forbidden_message = saved_message; + if (cxx_dialect >= cxx1y && type_uses_auto (r)) + { + error ("invalid use of %<auto%> in template argument"); + r = error_mark_node; + } return r; } diff --git a/gcc/testsuite/g++.dg/cpp1y/auto-neg1.C b/gcc/testsuite/g++.dg/cpp1y/auto-neg1.C new file mode 100644 index 0000000..1bc3995 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/auto-neg1.C @@ -0,0 +1,16 @@ +// PR c++/60312 +// { dg-options -std=c++1y } + +template<typename> struct A; + +template<> struct A<auto> // { dg-error "auto|template argument" } +{ + template<int> void foo(); +}; + +void bar() +{ + A<auto>().foo<0>(); // { dg-error "auto|template argument" } +} + +// { dg-prune-output "expected" } |