aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2010-03-24 12:49:06 -0400
committerJason Merrill <jason@gcc.gnu.org>2010-03-24 12:49:06 -0400
commitbff0b1a6df2f43750d5b4c6eeb02b0e9ad15fc30 (patch)
tree6b6d627dfe0e2092bced695a507fb81a747a5668
parent1e06efb6ebda010770bfc59257079570a25aa7fb (diff)
downloadgcc-bff0b1a6df2f43750d5b4c6eeb02b0e9ad15fc30.zip
gcc-bff0b1a6df2f43750d5b4c6eeb02b0e9ad15fc30.tar.gz
gcc-bff0b1a6df2f43750d5b4c6eeb02b0e9ad15fc30.tar.bz2
re PR c++/43502 ([C++0x] uninitialised read in grokfndecl() with lambda functions cause -fcompare-debug failures)
PR c++/43502 * parser.c (make_declarator): Initialize id_loc. (cp_parser_lambda_declarator_opt): And set it. From-SVN: r157701
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/parser.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/lambda/lambda-debug.C15
4 files changed, 28 insertions, 0 deletions
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 <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
--- 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 <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
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;
+}