diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c66ec827e0b6120f3ff7d0e0ab2be159dba89d0c..8b978c0364ef59ba34d82c14f3dac2e2e2b6c27d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2011-11-28  Jakub Jelinek  <jakub@redhat.com>
 
+	PR middle-end/50907
+	* function.c (convert_jumps_to_returns): When redirecting an edge
+	succ to EXIT_BLOCK_PTR, clear EDGE_CROSSING flag.
+
 	PR tree-optimization/50078
 	* tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Copy over
 	TREE_THIS_VOLATILE also from the old to new lhs resp. rhs.
diff --git a/gcc/function.c b/gcc/function.c
index 664858a29e3b9e4577bef79918e9b5557b41a365..6cf67c036d2ab5a3eb36f743f44f05cb05d39eb3 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -5670,6 +5670,7 @@ convert_jumps_to_returns (basic_block last_bb, bool simple_p,
 
       /* Fix up the CFG for the successful change we just made.  */
       redirect_edge_succ (e, EXIT_BLOCK_PTR);
+      e->flags &= ~EDGE_CROSSING;
     }
   VEC_free (basic_block, heap, src_bbs);
   return unconverted;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ee4a71492a83337f4b775d6beae4db05a64355d0..5a9275cf30e976a47be4bdf3a258e9edfba5a013 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2011-11-28  Jakub Jelinek  <jakub@redhat.com>
 
+	PR middle-end/50907
+	* gcc.dg/tree-prof/pr50907.c: New test.
+
 	PR tree-optimization/50078
 	* gcc.dg/pr50078.c: New test.
 
diff --git a/gcc/testsuite/gcc.dg/tree-prof/pr50907.c b/gcc/testsuite/gcc.dg/tree-prof/pr50907.c
new file mode 100644
index 0000000000000000000000000000000000000000..2ba26e392cbb8d3e6b9b4953c5c5064ab8c308eb
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-prof/pr50907.c
@@ -0,0 +1,5 @@
+/* PR middle-end/50907 */
+/* { dg-require-effective-target freorder } */
+/* { dg-options "-O -freorder-blocks-and-partition -fschedule-insns -fselective-scheduling -fpic" { target { { powerpc*-*-* ia64-*-* x86_64-*-* } && fpic } } } */
+
+#include "pr45354.c"