diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-10-31 22:30:05 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-10-31 22:30:05 +0100 |
| commit | 0a3098bba15a5f03c017683cad6aa81427865d00 (patch) | |
| tree | 1939145203a349699ba956bf379277b69453d127 /gcc | |
| parent | 728a8a74ac65513473bdfac4a426702737b2ca5b (diff) | |
| download | gcc-0a3098bba15a5f03c017683cad6aa81427865d00.zip gcc-0a3098bba15a5f03c017683cad6aa81427865d00.tar.gz gcc-0a3098bba15a5f03c017683cad6aa81427865d00.tar.bz2 | |
re PR c++/37965 (ICE with invalid auto variable in template)
PR c++/37965
* decl.c (cp_finish_decl): Diagnose type_uses_auto type with
no initializer.
* g++.dg/cpp0x/auto7.C: New test.
From-SVN: r141501
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 17 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/auto7.C | 13 |
4 files changed, 37 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8370307..5c20f45 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2008-10-31 Jakub Jelinek <jakub@redhat.com> + + PR c++/37965 + * decl.c (cp_finish_decl): Diagnose type_uses_auto type with + no initializer. + 2008-10-29 Manuel Lopez-Ibanez <manu@gcc.gnu.org> PR 11492 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index c9cac55..091edd5 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -5488,11 +5488,20 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p, DECL_INITIALIZED_IN_CLASS_P (decl) = 1; auto_node = type_uses_auto (type); - if (auto_node && !type_dependent_expression_p (init)) + if (auto_node) { - type = TREE_TYPE (decl) = do_auto_deduction (type, init, auto_node); - if (type == error_mark_node) - return; + if (init == NULL_TREE) + { + error ("declaration of %q#D has no initializer", decl); + TREE_TYPE (decl) = error_mark_node; + return; + } + else if (!type_dependent_expression_p (init)) + { + type = TREE_TYPE (decl) = do_auto_deduction (type, init, auto_node); + if (type == error_mark_node) + return; + } } if (processing_template_decl) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5d4dd10..f0e5179 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-10-31 Jakub Jelinek <jakub@redhat.com> + + PR c++/37965 + * g++.dg/cpp0x/auto7.C: New test. + 2008-10-31 Mikael Morin <mikael.morin@tele2.fr> PR fortran/35840 diff --git a/gcc/testsuite/g++.dg/cpp0x/auto7.C b/gcc/testsuite/g++.dg/cpp0x/auto7.C new file mode 100644 index 0000000..9ef5a80 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/auto7.C @@ -0,0 +1,13 @@ +// PR c++/37965 +// Negative test for auto +// { dg-options "-std=c++0x" } + +auto i = 6; +auto j; // { dg-error "has no initializer" } + +template<int> struct A +{ + static auto k = 7; + static auto l; // { dg-error "has no initializer" } + auto m; // { dg-error "has no initializer" } +}; |