summaryrefslogtreecommitdiff
path: root/gcc/cfgcleanup.c
diff options
context:
space:
mode:
authorAldy Hernandez <aldyh@redhat.com>2013-06-28 09:57:43 -0700
committerAldy Hernandez <aldyh@redhat.com>2013-06-28 09:57:43 -0700
commit7fb75753fa7e7c54af3b5e0aea65d8051feac55d (patch)
tree568d89cbf5521cbb882c33a3a42fb332ff2e49b8 /gcc/cfgcleanup.c
parentdb2127098137dea6c246041e0d763a57a174fa3c (diff)
parent2814409c2f46b5f71706f08358f395dddc9d8a81 (diff)
downloadgcc-7fb75753fa7e7c54af3b5e0aea65d8051feac55d.tar.gz
Merge remote-tracking branch 'origin/gomp-4_0-branch' into cilk-in-gomp
Conflicts: gcc/Makefile.in gcc/c-family/c-common.h gcc/c/c-parser.c gcc/cp/Make-lang.in gcc/cp/cp-tree.h gcc/gimple.h gcc/omp-low.c gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp
Diffstat (limited to 'gcc/cfgcleanup.c')
-rw-r--r--gcc/cfgcleanup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 1379cf76156..99e0baa756e 100644
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -456,7 +456,7 @@ try_forward_edges (int mode, basic_block b)
if (first != EXIT_BLOCK_PTR
&& find_reg_note (BB_END (first), REG_CROSSING_JUMP, NULL_RTX))
- return false;
+ return changed;
while (counter < n_basic_blocks)
{