diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/init.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 14 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/vt-55323.C | 12 |
4 files changed, 30 insertions, 12 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fc5351815..d382a04 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2012-11-14 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/55323 + * init.c (emit_mem_initializers): Skip arguments == error_mark_node. + 2012-11-14 Fabien Chêne <fabien@gcc.gnu.org> PR c++/11750 diff --git a/gcc/cp/init.c b/gcc/cp/init.c index c842aac..9f886c0 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -1047,12 +1047,17 @@ emit_mem_initializers (tree mem_inits) in_base_initializer = 1; /* Initialize base classes. */ - while (mem_inits - && TREE_CODE (TREE_PURPOSE (mem_inits)) != FIELD_DECL) + for (; (mem_inits + && TREE_CODE (TREE_PURPOSE (mem_inits)) != FIELD_DECL); + mem_inits = TREE_CHAIN (mem_inits)) { tree subobject = TREE_PURPOSE (mem_inits); tree arguments = TREE_VALUE (mem_inits); + /* We already have issued an error message. */ + if (arguments == error_mark_node) + continue; + if (arguments == NULL_TREE) { /* If these initializations are taking place in a copy constructor, @@ -1085,8 +1090,6 @@ emit_mem_initializers (tree mem_inits) tf_warning_or_error); expand_cleanup_for_base (subobject, NULL_TREE); } - - mem_inits = TREE_CHAIN (mem_inits); } in_base_initializer = 0; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 23424c5..07e2a9e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,15 +1,13 @@ -2012-11-14 Fabien Chêne <fabien@gcc.gnu.org> +2012-11-14 Paolo Carlini <paolo.carlini@oracle.com> - PR c++/11750 - * call.c (build_new_method_call_1): Check that the instance type - and the function context are the same before setting the flag - LOOKUP_NONVIRTUAL. + PR c++/55323 + * g++.dg/cpp0x/vt-55323.C: New. 2012-11-13 Sriraman Tallam <tmsriram@google.com> - * testsuite/g++.dg/mv4.C: Add require ifunc. Change error message. - * testsuite/g++.dg/mv5.C: Add require ifunc. - * testsuite/g++.dg/mv6.C: Add require ifunc. + * g++.dg/mv4.C: Add require ifunc. Change error message. + * g++.dg/mv5.C: Add require ifunc. + * g++.dg/mv6.C: Add require ifunc. 2012-11-13 Martin Jambor <mjambor@suse.cz> diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-55323.C b/gcc/testsuite/g++.dg/cpp0x/vt-55323.C new file mode 100644 index 0000000..d517b60 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/vt-55323.C @@ -0,0 +1,12 @@ +// { dg-options "-std=c++11" } + +struct foo { + foo(int a, float b); +}; + +struct bar : foo { + template<typename... Args> + bar(Args&&... args) : foo(2, args){} // { dg-error "parameter packs" } +}; + +bar b(2,1.); |