diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2011-02-23 00:37:43 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2011-02-23 00:37:43 +0000 |
| commit | a26e0b8113f3a58fde9b98041140b301c4407c00 (patch) | |
| tree | 6f191d30d0d11b9693f93644a9ab60e272be6665 | |
| parent | b152a6158e401ee9e3752b4403deadd91aec2418 (diff) | |
| download | gcc-a26e0b8113f3a58fde9b98041140b301c4407c00.zip gcc-a26e0b8113f3a58fde9b98041140b301c4407c00.tar.gz gcc-a26e0b8113f3a58fde9b98041140b301c4407c00.tar.bz2 | |
re PR c++/47242 ([C++0x] ICE: tree check: expected field_decl, have error_mark in build_lambda_object, at cp/semantics.c:7604 on invalid lambda function)
/cp
2011-02-22 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/47242
* semantics.c (build_lambda_object): Bail out if a field is
error_mark_node.
/testsuite
2011-02-22 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/47242
* g++.dg/cpp0x/lambda/lambda-ice4.C: New.
From-SVN: r170423
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice4.C | 14 |
4 files changed, 33 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b532371..291f09b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-02-22 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/47242 + * semantics.c (build_lambda_object): Bail out if a field is + error_mark_node. + 2011-02-22 Dodji Seketeli <dodji@redhat.com> PR c++/47666 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 6a9c6a0..4af007d 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -7795,6 +7795,12 @@ build_lambda_object (tree lambda_expr) tree field = TREE_PURPOSE (node); tree val = TREE_VALUE (node); + if (field == error_mark_node) + { + expr = error_mark_node; + goto out; + } + if (DECL_P (val)) mark_used (val); @@ -7830,6 +7836,7 @@ build_lambda_object (tree lambda_expr) expr = finish_compound_literal (type, expr); CLASSTYPE_NON_AGGREGATE (type) = 1; + out: input_location = saved_loc; return expr; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index aa53085..f64735e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-02-22 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/47242 + * g++.dg/cpp0x/lambda/lambda-ice4.C: New. + 2011-02-23 Jie Zhang <jie@codesourcery.com> PR rtl-optimization/47763 @@ -154,7 +159,7 @@ PR objc/47784 * objc.dg/property/dotsyntax-22.m: New. * obj-c++.dg/property/dotsyntax-22.mm: New. - + 2011-02-20 Dodji Seketeli <dodji@redhat.com> PR c++/46394 diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice4.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice4.C new file mode 100644 index 0000000..77c773b --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice4.C @@ -0,0 +1,14 @@ +// PR c++/47242 +// { dg-options "-std=c++0x" } + +template < typename > void +bar () +{ + [i]{}; // { dg-error "declared|invalid" } +} + +void +foo () +{ + bar<int>(); +} |