From aad5badd41812674fdd02fce3647831d85137825 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 26 Feb 2009 19:59:38 +0000 Subject: [PATCH] re PR c++/37789 (ICE with __FUNCTION__) gcc/cp 2009-02-26 H.J. Lu PR c++/37789 * parser.c (cp_parser_mem_initializer): Return error_mark_node if cp_parser_mem_initializer_id returns error_mark_node. gcc/testsuite/ 2009-02-26 H.J. Lu PR c++/37789 * other/pr37789.C: New. From-SVN: r144451 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 6 +++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/other/pr37789.C | 7 +++++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/other/pr37789.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9bf4224256f..9d1ab5a6211 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2009-02-26 H.J. Lu + + PR c++/37789 + * parser.c (cp_parser_mem_initializer): Return error_mark_node + if cp_parser_mem_initializer_id returns error_mark_node. + 2009-02-24 Richard Guenther PR c++/39242 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index ead7d3a3907..80a767ebe2d 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -9200,7 +9200,11 @@ cp_parser_mem_initializer (cp_parser* parser) mem_initializer_id = NULL_TREE; } else - mem_initializer_id = cp_parser_mem_initializer_id (parser); + { + mem_initializer_id = cp_parser_mem_initializer_id (parser); + if (mem_initializer_id == error_mark_node) + return mem_initializer_id; + } member = expand_member_init (mem_initializer_id); if (member && !DECL_P (member)) in_base_initializer = 1; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4b9936e9564..d86d2d56fd3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-02-26 H.J. Lu + + PR c++/37789 + * other/pr37789.C: New. + 2009-02-26 Paul Thomas PR fortran/39295 diff --git a/gcc/testsuite/g++.dg/other/pr37789.C b/gcc/testsuite/g++.dg/other/pr37789.C new file mode 100644 index 00000000000..728c2fcc6f2 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/pr37789.C @@ -0,0 +1,7 @@ +// PR c++/37789 +// { dg-do compile } + +void foo(): +{ // { dg-error "initializers|identifier" } + __FUNCTION__; +}