From 8ee8eae73d64125b00ca568011622fd64d393b25 Mon Sep 17 00:00:00 2001 From: paolo Date: Sat, 7 Jun 2008 08:06:46 +0000 Subject: [PATCH] /cp 2008-06-07 Paolo Carlini PR c++/35327 * decl.c (grokdeclarator): In case of wrong return type return immediately error_mark_node. /testsuite 2008-06-07 Paolo Carlini PR c++/35327 * g++.dg/parse/crash41.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@136518 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 6 +++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/parse/crash41.C | 8 ++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/parse/crash41.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 936db24..fb79f47 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2008-06-07 Paolo Carlini + + PR c++/35327 + * decl.c (grokdeclarator): In case of wrong return type return + immediately error_mark_node. + 2008-06-06 Jakub Jelinek * cp-tree.h (cxx_omp_finish_clause, cxx_omp_create_clause_info, diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 8056518..f97039b 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -8088,17 +8088,17 @@ grokdeclarator (const cp_declarator *declarator, set_no_warning = true; } - /* Warn about some types functions can't return. */ + /* Error about some types functions can't return. */ if (TREE_CODE (type) == FUNCTION_TYPE) { error ("%qs declared as function returning a function", name); - type = integer_type_node; + return error_mark_node; } if (TREE_CODE (type) == ARRAY_TYPE) { error ("%qs declared as function returning an array", name); - type = integer_type_node; + return error_mark_node; } /* Pick up type qualifiers which should be applied to `this'. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a1ce73c..40e8b51 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-06-07 Paolo Carlini + + PR c++/35327 + * g++.dg/parse/crash41.C: New. + 2008-06-06 Jakub Jelinek PR target/36362 diff --git a/gcc/testsuite/g++.dg/parse/crash41.C b/gcc/testsuite/g++.dg/parse/crash41.C new file mode 100644 index 0000000..746dbbc --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/crash41.C @@ -0,0 +1,8 @@ +// PR c++/35327 + +struct A +{ + A(int)(); // { dg-error "declared" } +}; + +template void foo(bool b, A a) { b ? a : 0; } // { dg-error "no match" } -- 2.7.4