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

gcc/cp/ChangeLog

 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.

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)

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 }