aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSegher Boessenkool <segher@kernel.crashing.org>2016-05-20 23:31:17 +0200
committerSegher Boessenkool <segher@gcc.gnu.org>2016-05-20 23:31:17 +0200
commite93044fc02fccbc70044fa0bd51a53c9f3439e32 (patch)
tree8742d10940ba2145ba78db2693b769875cc991e7
parentc91a0948c3d72d8625111b5c5b6a0392c8830bb5 (diff)
downloadgcc-e93044fc02fccbc70044fa0bd51a53c9f3439e32.zip
gcc-e93044fc02fccbc70044fa0bd51a53c9f3439e32.tar.gz
gcc-e93044fc02fccbc70044fa0bd51a53c9f3439e32.tar.bz2
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. From-SVN: r236545
-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 dc38a17..04a098b 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 5ff17c7..726c20c 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. */