function.c (expand_function_end): Remove an "if" statement that always trigger.

	* function.c (expand_function_end): Remove an "if" statement
	that always trigger.
	* stmt.c (expand_null_return_1): Likewise.

From-SVN: r90497

gcc/ChangeLog

+2004-11-11  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* function.c (expand_function_end): Remove an "if" statement
+	that always trigger.
+	* stmt.c (expand_null_return_1): Likewise.
+
 2004-11-11  James E. Wilson  <wilson@specifixinc.com>
 
 	* config/ia64/ia64.h (HARD_REGNO_NREGS): Handle XCmode.

gcc/function.c

@@ -4317,13 +4317,8 @@ expand_function_end (void)
      is computed.  */
   clobber_after = get_last_insn ();
 
-  /* Output the label for the actual return from the function,
-     if one is expected.  This happens either because a function epilogue
-     is used instead of a return instruction, or because a return was done
-     with a goto in order to run local cleanups, or because of pcc-style
-     structure returning.  */
-  if (return_label)
-    emit_label (return_label);
+  /* Output the label for the actual return from the function.  */
+  emit_label (return_label);
 
   /* Let except.c know where it should emit the call to unregister
      the function context for sjlj exceptions.  */

gcc/stmt.c

@@ -1564,15 +1564,9 @@ expand_value_return (rtx val)
 static void
 expand_null_return_1 (void)
 {
-  rtx end_label;
-
   clear_pending_stack_adjust ();
   do_pending_stack_adjust ();
-
-  end_label = return_label;
-  if (end_label == 0)
-     end_label = return_label = gen_label_rtx ();
-  emit_jump (end_label);
+  emit_jump (return_label);
 }
 
 /* Generate RTL to evaluate the expression RETVAL and return it