From 3c5a5d99f20cbe03c43f7a04e4dc4d1983fca558 Mon Sep 17 00:00:00 2001 From: jason Date: Wed, 24 Mar 2010 16:49:06 +0000 Subject: [PATCH] PR c++/43502 * parser.c (make_declarator): Initialize id_loc. (cp_parser_lambda_declarator_opt): And set it. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157701 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 2 ++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/lambda/lambda-debug.C | 15 +++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-debug.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 81df987..0aad33c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2010-03-24 Jason Merrill + + PR c++/43502 + * parser.c (make_declarator): Initialize id_loc. + (cp_parser_lambda_declarator_opt): And set it. + 2010-03-23 Jason Merrill Make lambda conversion op and op() non-static. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index cbbfd94..41982f7 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -890,6 +890,7 @@ make_declarator (cp_declarator_kind kind) declarator->attributes = NULL_TREE; declarator->declarator = NULL; declarator->parameter_pack_p = false; + declarator->id_loc = UNKNOWN_LOCATION; return declarator; } @@ -7395,6 +7396,7 @@ cp_parser_lambda_declarator_opt (cp_parser* parser, tree lambda_expr) declarator = make_call_declarator (declarator, param_list, quals, exception_spec, /*late_return_type=*/NULL_TREE); + declarator->id_loc = LAMBDA_EXPR_LOCATION (lambda_expr); fco = grokmethod (&return_type_specs, declarator, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 692353b..d1598dd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-03-24 Jason Merrill + + PR c++/43502 + * g++.dg/cpp0x/lambda/lambda-debug.C: New. + 2010-03-24 Martin Jambor * gcc.dg/ipa/ipa-1.c: Delete trailing spaces, put the call to f into diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-debug.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-debug.C new file mode 100644 index 0000000..07fc189 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-debug.C @@ -0,0 +1,15 @@ +// PR c++/43502 +// { dg-options "-std=c++0x -fcompare-debug" } + +void g (int n) +{ + int bef ([]{return 0;}()); +} +struct S { + void f (int = []{return 0;}(), int = [] { return 0;}()); +}; +int main () +{ + S ().f (); + return 0; +} -- 2.7.4