diff options
| author | Jason Merrill <jason@redhat.com> | 2012-03-03 19:55:51 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-03-03 19:55:51 -0500 |
| commit | a491b7be7f9f60cb13d31d4fe87b4353f3520d1d (patch) | |
| tree | 8452a360ec89163f195fbac46e01213360d540ff /gcc | |
| parent | 743af85b75560f64ae14845f3889b7b18cba22a7 (diff) | |
| download | gcc-a491b7be7f9f60cb13d31d4fe87b4353f3520d1d.zip gcc-a491b7be7f9f60cb13d31d4fe87b4353f3520d1d.tar.gz gcc-a491b7be7f9f60cb13d31d4fe87b4353f3520d1d.tar.bz2 | |
* init.c (perform_member_init): Cope with uninstantiated NSDMI.
From-SVN: r184877
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/cp/init.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/nsdmi-defer6.C | 8 |
4 files changed, 18 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f1eb802..f837570 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2012-03-03 Jason Merrill <jason@redhat.com> + * init.c (perform_member_init): Cope with uninstantiated NSDMI. + Core 1270 * call.c (build_aggr_conv): Call reshape_init. (convert_like_real): Likewise. diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 2355a04..1b2a1ef 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -540,6 +540,12 @@ perform_member_init (tree member, tree init) else { init = DECL_INITIAL (member); + if (init && TREE_CODE (init) == DEFAULT_ARG) + { + error ("constructor required before non-static data member " + "for %qD has been parsed", member); + init = NULL_TREE; + } /* Strip redundant TARGET_EXPR so we don't need to remap it, and so the aggregate init code below will see a CONSTRUCTOR. */ if (init && TREE_CODE (init) == TARGET_EXPR diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6839140..beb8af4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,7 @@ 2012-03-03 Jason Merrill <jason@redhat.com> + * g++.dg/cpp0x/nsdmi-defer6.C: New. + Core 1270 * g++.dg/cpp0x/initlist65.C: New. diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer6.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer6.C new file mode 100644 index 0000000..033c142 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-defer6.C @@ -0,0 +1,8 @@ +// { dg-do compile { target c++11 } } + +struct A // { dg-error "non-static data member" } +{ + int i = (A(), 42); // { dg-message "required here" } +}; + +A a; |