diff options
| author | Jeff Law <law@redhat.com> | 2011-11-30 05:16:36 +0000 |
|---|---|---|
| committer | Jeff Law <law@redhat.com> | 2011-11-30 05:16:36 +0000 |
| commit | 7b5177cc9956a68a50825c443a6d396fdc1af2b5 (patch) | |
| tree | a6b80dca8f72a2e7640e4d535901e42325b2a954 /gcc/function.c | |
| parent | 6377b0d9b395f395e25bd4a030a9056171433061 (diff) | |
| parent | ee4a734e5eece9824adc2a26e518c99bbdbe802e (diff) | |
Weekly merge from trunk. No regressions.reload-v2a
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/reload-v2a@181834 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/function.c')
| -rw-r--r-- | gcc/function.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/function.c b/gcc/function.c index 0ee69ef22b6..664858a29e3 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -6230,7 +6230,8 @@ thread_prologue_and_epilogue_insns (void) && !active_insn_between (BB_HEAD (last_bb), BB_END (last_bb))) convert_jumps_to_returns (last_bb, false, NULL); - if (EDGE_COUNT (exit_fallthru_edge->src->preds) != 0) + if (EDGE_COUNT (last_bb->preds) != 0 + && single_succ_p (last_bb)) { last_bb = emit_return_for_exit (exit_fallthru_edge, false); epilogue_end = returnjump = BB_END (last_bb); |