diff options
| author | Jason Merrill <jason@redhat.com> | 2010-02-09 17:06:23 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-02-09 17:06:23 -0500 |
| commit | 0bbe864d0d2de6fcb0e77ba8d47b6974f4a4f6cb (patch) | |
| tree | 44b918be15b92a6d3e047d0568232aa3f4ce8f14 | |
| parent | 643d4cd6a10f6d202011eb3005c65994219932f3 (diff) | |
| download | gcc-0bbe864d0d2de6fcb0e77ba8d47b6974f4a4f6cb.zip gcc-0bbe864d0d2de6fcb0e77ba8d47b6974f4a4f6cb.tar.gz gcc-0bbe864d0d2de6fcb0e77ba8d47b6974f4a4f6cb.tar.bz2 | |
re PR c++/42399 ([c++0x] assigning lambda causes segfault from null dereference at libiberty/splay-tree.c:148)
PR c++/42399
* pt.c (tsubst_copy_and_build): Propagate LAMBDA_EXPR_LOCATION.
From-SVN: r156635
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc2.C | 19 |
4 files changed, 29 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 42c0e9f..8fcb181 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2010-02-09 Jason Merrill <jason@redhat.com> + PR c++/42399 + * pt.c (tsubst_copy_and_build): Propagate LAMBDA_EXPR_LOCATION. + +2010-02-09 Jason Merrill <jason@redhat.com> + PR c++/42370 * decl2.c (change_return_type): New fn. * semantics.c (apply_lambda_return_type): Use it. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index b903f77..1327d54 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -12674,6 +12674,8 @@ tsubst_copy_and_build (tree t, TREE_TYPE (r) = type; CLASSTYPE_LAMBDA_EXPR (type) = r; + LAMBDA_EXPR_LOCATION (r) + = LAMBDA_EXPR_LOCATION (t); LAMBDA_EXPR_DEFAULT_CAPTURE_MODE (r) = LAMBDA_EXPR_DEFAULT_CAPTURE_MODE (t); LAMBDA_EXPR_MUTABLE_P (r) = LAMBDA_EXPR_MUTABLE_P (t); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b91829c..e1394f4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2010-02-09 Jason Merrill <jason@redhat.com> + PR c++/42399 + * g++.dg/cpp0x/lambda/lambda-errloc2.C: New. + PR c++/42370 * g++.dg/cpp0x/lambda/lambda-warn2.C: New. diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc2.C new file mode 100644 index 0000000..3d53c13 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-errloc2.C @@ -0,0 +1,19 @@ +// PR c++/42399 +// { dg-options "-std=c++0x" } + +struct A { + A(); + A(const A&) = delete; // { dg-error "deleted function" } +}; + +template <class T> +void f() +{ + T t; + [t] { return 0; }; // { dg-error "used here" } +} + +int main() +{ + f<A>(); // { dg-message "instantiated" } +} |