summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsegher <segher@138bc75d-0d04-0410-961f-82ee72b054a4>2016-05-20 21:31:17 +0000
committersegher <segher@138bc75d-0d04-0410-961f-82ee72b054a4>2016-05-20 21:31:17 +0000
commit1b912edfb6aac7b0298053ce8c3d80a10cc502be (patch)
tree8742d10940ba2145ba78db2693b769875cc991e7
parent58a5f4c094d63cc226a649b63758ac8e10c20174 (diff)
downloadgcc-1b912edfb6aac7b0298053ce8c3d80a10cc502be.tar.gz
This fixes a bug in my r236491: on nvptx, functions without prologue
would not get an epilogue either. * function.c (thread_prologue_and_epilogue_insns): Commit the insertion of the epilogue. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@236545 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/function.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc38a17973c..04a098bf409 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-20 Segher Boessenkool <segher@kernel.crashing.org>
+
+ * function.c (thread_prologue_and_epilogue_insns): Commit the
+ insertion of the epilogue.
+
2016-05-20 Martin Jambor <mjambor@suse.cz>
PR tree-optimization/70884
diff --git a/gcc/function.c b/gcc/function.c
index 5ff17c75b26..726c20ca017 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -5966,6 +5966,7 @@ thread_prologue_and_epilogue_insns (void)
if (epilogue_seq)
{
insert_insn_on_edge (epilogue_seq, exit_fallthru_edge);
+ commit_edge_insertions ();
/* The epilogue insns we inserted may cause the exit edge to no longer
be fallthru. */