diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2009-09-08 22:00:42 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2009-09-08 22:00:42 +0000 |
| commit | f8c6dba24e55282d4b48fcac6f7e29909448f594 (patch) | |
| tree | bccaa6e44841070c71957968b66d65000c75976f | |
| parent | 7c20033eccbeecfabd802c0fe752b7acadec02c1 (diff) | |
| download | gcc-f8c6dba24e55282d4b48fcac6f7e29909448f594.zip gcc-f8c6dba24e55282d4b48fcac6f7e29909448f594.tar.gz gcc-f8c6dba24e55282d4b48fcac6f7e29909448f594.tar.bz2 | |
re PR c++/39923 ([C++0x] ICE in build_init_list_var_init)
/cp
2009-09-08 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/39923
* decl.c (build_init_list_var_init): Check return value of
perform_implicit_conversion.
/testsuite
2009-09-08 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/39923
* g++.dg/cpp0x/initlist24.C: New.
From-SVN: r151536
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/initlist24.C | 9 |
4 files changed, 23 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4244976..3656dba 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2009-09-08 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/39923 + * decl.c (build_init_list_var_init): Check return value of + perform_implicit_conversion. + 2009-09-03 Jason Merrill <jason@redhat.com> * class.c (currently_open_class): Make sure we're dealing with the diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 99ae9f1..0cfcb4f 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4415,6 +4415,9 @@ build_init_list_var_init (tree decl, tree type, tree init, tree *cleanup) { tree aggr_init, array, arrtype; init = perform_implicit_conversion (type, init, tf_warning_or_error); + if (error_operand_p (init)) + return error_mark_node; + aggr_init = TARGET_EXPR_INITIAL (init); init = build2 (INIT_EXPR, type, decl, init); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f265406..045c207 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-09-08 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/39923 + * g++.dg/cpp0x/initlist24.C: New. + 2009-09-08 Ozkan Sezer <sezeroz@gmail.com> * gcc.dg/large-size-array-2.c: Fix target requirement. diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist24.C b/gcc/testsuite/g++.dg/cpp0x/initlist24.C new file mode 100644 index 0000000..33e97c7 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist24.C @@ -0,0 +1,9 @@ +// PR c++/39923 +// { dg-options "-std=c++0x" } + +#include <initializer_list> + +void test3() +{ + std::initializer_list<int> list{move}; // { dg-error "not declared|could not convert" } +} |