diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2011-12-08 01:50:26 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2011-12-08 01:50:26 +0100 |
| commit | a633b93ea34210dcb8ce06c7bfb3df8efd7c3fbc (patch) | |
| tree | 9568d2f1b080a0e4b9445607ee40724faa3c9f59 /gcc | |
| parent | 2df708d9371748015ecced5191cc3423ba7fe421 (diff) | |
| download | gcc-a633b93ea34210dcb8ce06c7bfb3df8efd7c3fbc.zip gcc-a633b93ea34210dcb8ce06c7bfb3df8efd7c3fbc.tar.gz gcc-a633b93ea34210dcb8ce06c7bfb3df8efd7c3fbc.tar.bz2 | |
re PR c++/51401 ([c++0x] [4.7 Regression] ICE with invalid use of auto in template)
PR c++/51401
* decl.c (grokdeclarator): Error for auto on non-static data members.
* g++.dg/cpp0x/auto7.C: Adjust expected error message.
* g++.dg/cpp0x/auto29.C: New test.
From-SVN: r182097
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/auto29.C | 25 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/auto7.C | 2 |
5 files changed, 39 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 19bbfed..ebb636e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-12-07 Jakub Jelinek <jakub@redhat.com> + PR c++/51401 + * decl.c (grokdeclarator): Error for auto on non-static data members. + PR c++/51429 * typeck2.c (cxx_incomplete_type_diagnostic): Don't ICE if TREE_OPERAND (value, 1) is overloaded. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 07cc9e6..5a4e027 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -9971,6 +9971,12 @@ grokdeclarator (const cp_declarator *declarator, } else if (decl_context == FIELD) { + if (!staticp && type_uses_auto (type)) + { + error ("non-static data member declared %<auto%>"); + type = error_mark_node; + } + /* The C99 flexible array extension. */ if (!staticp && TREE_CODE (type) == ARRAY_TYPE && TYPE_DOMAIN (type) == NULL_TREE) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e95eb49..31b2d2e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2011-12-07 Jakub Jelinek <jakub@redhat.com> + PR c++/51401 + * g++.dg/cpp0x/auto7.C: Adjust expected error message. + * g++.dg/cpp0x/auto29.C: New test. + PR c++/51429 * g++.dg/parse/error45.C: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/auto29.C b/gcc/testsuite/g++.dg/cpp0x/auto29.C new file mode 100644 index 0000000..8187457 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/auto29.C @@ -0,0 +1,25 @@ +// PR c++/51401 +// { dg-do compile } +// { dg-options "-std=c++11" } + +template <int> +struct A +{ + auto i; // { dg-error "non-static data member declared" } +}; + +template <int> +struct B +{ + auto i = 0; // { dg-error "non-static data member declared" } +}; + +struct C +{ + auto i; // { dg-error "non-static data member declared" } +}; + +struct D +{ + auto i = 0; // { dg-error "non-static data member declared" } +}; diff --git a/gcc/testsuite/g++.dg/cpp0x/auto7.C b/gcc/testsuite/g++.dg/cpp0x/auto7.C index e7ab723..3b3b829 100644 --- a/gcc/testsuite/g++.dg/cpp0x/auto7.C +++ b/gcc/testsuite/g++.dg/cpp0x/auto7.C @@ -9,5 +9,5 @@ template<int> struct A { static auto k = 7; // { dg-error "non-const" } static auto l; // { dg-error "has no initializer" } - auto m; // { dg-error "has no initializer" } + auto m; // { dg-error "non-static data member declared" } }; |