re PR c++/49508 (Bogus "control reaches end of non-void function" warning)

	PR c++/49508
	* semantics.c (finish_return_stmt): Suppress -Wreturn-type on
	erroneous return statement.

From-SVN: r220252

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fb3e2dc79e4d8044b64687237af81dab4965530c..2280e6bd0942f9512adafeebb60f438b7cf876b6 100644 (file)
--- 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 75aa501fe8c00627866f290060c8dd6a41f85dac..f325e41f417fa65dbbf946a6701881cca828587f 100644 (file)
--- 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 b595662c22850b7bc27c9f4c0c39f28e9897f049..e1079cfb0aaf0a0d76af841aec0d01df3327adf3 100644 (file)
--- 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 }