diff options
| author | Segher Boessenkool <segher@kernel.crashing.org> | 2016-05-19 09:51:48 +0200 |
|---|---|---|
| committer | Segher Boessenkool <segher@gcc.gnu.org> | 2016-05-19 09:51:48 +0200 |
| commit | cc1f86f3fd44e4e34ba9bdc699ad8ff3d1ed73dd (patch) | |
| tree | 1f609a49483f97d6717eb41f46a5edaeb59630c0 | |
| parent | 43c0068e60ad1518cc6196eeac51eb811fe62f8f (diff) | |
| download | gcc-cc1f86f3fd44e4e34ba9bdc699ad8ff3d1ed73dd.zip gcc-cc1f86f3fd44e4e34ba9bdc699ad8ff3d1ed73dd.tar.gz gcc-cc1f86f3fd44e4e34ba9bdc699ad8ff3d1ed73dd.tar.bz2 | |
function: A fix for my previous commit
It failed for targets that have an eh_return pattern with a splitter
gated by epilogue_done.
* function.c (thread_prologue_and_epilogue_insn): Move the
"goto epilogue_done" one block later.
From-SVN: r236441
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/function.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 63fe800..e2e29fe 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2016-05-19 Segher Boessenkool <segher@kernel.crashing.org> + + * function.c (thread_prologue_and_epilogue_insn): Move the + "goto epilogue_done" one block later. + 2016-05-19 Richard Biener <rguenther@suse.de> PR tree-optimization/70729 diff --git a/gcc/function.c b/gcc/function.c index 1c56253..4c236eb 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -5960,11 +5960,6 @@ thread_prologue_and_epilogue_insns (void) exit_fallthru_edge = find_fallthru_edge (EXIT_BLOCK_PTR_FOR_FN (cfun)->preds); - /* If nothing falls through into the exit block, we don't need an - epilogue. */ - if (exit_fallthru_edge == NULL) - goto epilogue_done; - /* A small fib -- epilogue is not yet completed, but we wish to re-use this marker for the splits of EH_RETURN patterns, and nothing else uses the flag in the meantime. */ @@ -5994,6 +5989,11 @@ thread_prologue_and_epilogue_insns (void) emit_note_after (NOTE_INSN_EPILOGUE_BEG, prev); } + /* If nothing falls through into the exit block, we don't need an + epilogue. */ + if (exit_fallthru_edge == NULL) + goto epilogue_done; + if (epilogue_seq) { insert_insn_on_edge (epilogue_seq, exit_fallthru_edge); |