From 526c334b94b9d19f3ffcbaaf6d8e01ba3724efb0 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Thu, 11 Nov 2004 22:02:47 +0000 Subject: [PATCH] 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 | 6 ++++++ gcc/function.c | 9 ++------- gcc/stmt.c | 8 +------- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3d9f2503db9..baac6a7ee69 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2004-11-11 Kazu Hirata + + * 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 * config/ia64/ia64.h (HARD_REGNO_NREGS): Handle XCmode. diff --git a/gcc/function.c b/gcc/function.c index 338ad967491..18829019e51 100644 --- a/gcc/function.c +++ b/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. */ diff --git a/gcc/stmt.c b/gcc/stmt.c index d7f37a30f7b..3066a8b4123 100644 --- a/gcc/stmt.c +++ b/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 -- 2.30.2