diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.jason/report.C | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fb3e2dc79e4..2280e6bd094 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2015-01-29 Jason Merrill <jason@redhat.com> + PR c++/49508 + * semantics.c (finish_return_stmt): Suppress -Wreturn-type on + erroneous return statement. + PR c++/64521 * repo.c (repo_emit_p): It's OK for a clone to be extern at this point. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 75aa501fe8c..f325e41f417 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -888,7 +888,13 @@ finish_return_stmt (tree expr) if (error_operand_p (expr) || (flag_openmp && !check_omp_return ())) - return error_mark_node; + { + /* Suppress -Wreturn-type for this function. */ + if (warn_return_type) + TREE_NO_WARNING (current_function_decl) = true; + return error_mark_node; + } + if (!processing_template_decl) { if (warn_sequence_point) diff --git a/gcc/testsuite/g++.old-deja/g++.jason/report.C b/gcc/testsuite/g++.old-deja/g++.jason/report.C index b595662c228..e1079cfb0aa 100644 --- a/gcc/testsuite/g++.old-deja/g++.jason/report.C +++ b/gcc/testsuite/g++.old-deja/g++.jason/report.C @@ -72,6 +72,3 @@ int darg (char X::*p) { undef3 (1); // { dg-error "" } implicit declaration } // { dg-warning "no return statement" } - -// { dg-message "warning: control reaches end of non-void function" "" { target *-*-* } 36 } -// { dg-message "warning: control reaches end of non-void function" "" { target *-*-* } 65 } |