diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-01-12 15:43:22 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-01-12 15:43:22 +0000 |
| commit | 2ec31349fdc0077c0f147040f174e8f5727917c9 (patch) | |
| tree | 63c40fa8e8187caa4b08c713f55fd24395af7701 | |
| parent | a6c1b5f02c8678f45eeb450600cdd87456146b46 (diff) | |
| download | gcc-2ec31349fdc0077c0f147040f174e8f5727917c9.tar.gz | |
PR c++/38794
* decl.c (start_function): If grokdeclarator hasn't returned
FUNCTION_DECL nor error_mark_node, issue diagnostics.
* g++.dg/parse/typedef9.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@143292 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/typedef9.C | 8 |
4 files changed, 24 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7b0c39f00b2..de7d1ab0684 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2009-01-12 Jakub Jelinek <jakub@redhat.com> + + PR c++/38794 + * decl.c (start_function): If grokdeclarator hasn't returned + FUNCTION_DECL nor error_mark_node, issue diagnostics. + 2009-01-11 Jakub Jelinek <jakub@redhat.com> PR c++/36254 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 2e19fb3c8d3..c6ed22d6e74 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1,6 +1,6 @@ /* Process declarations and variables for C++ compiler. Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@cygnus.com) @@ -11774,10 +11774,15 @@ start_function (cp_decl_specifier_seq *declspecs, tree decl1; decl1 = grokdeclarator (declarator, declspecs, FUNCDEF, 1, &attrs); + if (decl1 == error_mark_node) + return 0; /* If the declarator is not suitable for a function definition, cause a syntax error. */ if (decl1 == NULL_TREE || TREE_CODE (decl1) != FUNCTION_DECL) - return 0; + { + error ("invalid function declaration"); + return 0; + } if (DECL_MAIN_P (decl1)) /* main must return int. grokfndecl should have corrected it diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 260504aa865..28df5ac74e5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2009-01-12 Jakub Jelinek <jakub@redhat.com> + PR c++/38794 + * g++.dg/parse/typedef9.C: New test. + PR tree-optimization/38807 * gcc.c-torture/compile/pr38807.c: New test. diff --git a/gcc/testsuite/g++.dg/parse/typedef9.C b/gcc/testsuite/g++.dg/parse/typedef9.C new file mode 100644 index 00000000000..7788f781fb6 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/typedef9.C @@ -0,0 +1,8 @@ +// PR c++/38794 +// { dg-do compile } + +typedef void foo () {} // { dg-error "invalid function declaration" } +struct S +{ + typedef int bar (void) { return 0; } // { dg-error "invalid member function declaration" } +}; |