diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/init.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice2.C | 16 |
4 files changed, 32 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 142dd53..6dd121a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2010-12-15 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/42083 + * init.c (build_value_init): Check build_special_member_call return + value for error_mark_node. + 2010-12-14 Jason Merrill <jason@redhat.com> PR c++/46930 diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 5a4f91c..9c3dd32 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -314,9 +314,11 @@ build_value_init (tree type, tsubst_flags_t complain) tree ctor = build_special_member_call (NULL_TREE, complete_ctor_identifier, NULL, type, LOOKUP_NORMAL, complain); - - ctor = build_aggr_init_expr (type, ctor); - AGGR_INIT_ZERO_FIRST (ctor) = 1; + if (ctor != error_mark_node) + { + ctor = build_aggr_init_expr (type, ctor); + AGGR_INIT_ZERO_FIRST (ctor) = 1; + } return ctor; } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9c71bba..1d865c6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-12-15 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/42083 + * g++.dg/cpp0x/lambda/lambda-ice2.C: New. + 2010-12-15 H.J. Lu <hongjiu.lu@intel.com> * gfortran.dg/debug/pr46756.f: Correct PR number. diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice2.C new file mode 100644 index 0000000..352137a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice2.C @@ -0,0 +1,16 @@ +// PR c++/42083 +// { dg-options "-std=c++0x" } + +template<typename F> +decltype(F()) run(F f) // { dg-message "note" } +{ + return f(); +} + +int main() +{ + auto l = []() { return 5; }; + + run(l); // { dg-error "no match" } + // { dg-message "candidate" "candidate note" { target *-*-* } 14 } +} |