diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2009-02-26 19:59:38 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2009-02-26 11:59:38 -0800 |
| commit | aad5badd41812674fdd02fce3647831d85137825 (patch) | |
| tree | 6613d8ccfe1bf35acc32347289dd7ba287c306c6 | |
| parent | 9dadeeb83c129bc14c56b09bb385f73b36119881 (diff) | |
| download | gcc-aad5badd41812674fdd02fce3647831d85137825.zip gcc-aad5badd41812674fdd02fce3647831d85137825.tar.gz gcc-aad5badd41812674fdd02fce3647831d85137825.tar.bz2 | |
re PR c++/37789 (ICE with __FUNCTION__)
gcc/cp
2009-02-26 H.J. Lu <hongjiu.lu@intel.com>
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 <hongjiu.lu@intel.com>
PR c++/37789
* other/pr37789.C: New.
From-SVN: r144451
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/pr37789.C | 7 |
4 files changed, 23 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9bf4224..9d1ab5a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2009-02-26 H.J. Lu <hongjiu.lu@intel.com> + + 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 <rguenther@suse.de> PR c++/39242 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index ead7d3a..80a767e 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 4b9936e..d86d2d5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-02-26 H.J. Lu <hongjiu.lu@intel.com> + + PR c++/37789 + * other/pr37789.C: New. + 2009-02-26 Paul Thomas <pault@gcc.gnu.org> 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 0000000..728c2fc --- /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__; +} |