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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 81df987..0aad33c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-24  Jason Merrill  <jason@redhat.com>
+
+       PR c++/43502
+       * parser.c (make_declarator): Initialize id_loc.
+       (cp_parser_lambda_declarator_opt): And set it.
+
 2010-03-23  Jason Merrill  <jason@redhat.com>
 
        Make lambda conversion op and op() non-static.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index cbbfd94..41982f7 100644 (file)
--- 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 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-24  Jason Merrill  <jason@redhat.com>
+
+       PR c++/43502
+       * g++.dg/cpp0x/lambda/lambda-debug.C: New.
+
 2010-03-24  Martin Jambor  <mjambor@suse.cz>
 
        * 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 (file)
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;
+}