From d3b623c7af627ec5d0fbd14d94a115b6cac0e501 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 28 Nov 2011 22:04:10 +0100
Subject: [PATCH] re PR middle-end/50907 (EDGE_CROSSING incorrectly set across
same section with -freorder-blocks-and-partition -fPIC -fprofile-use)
PR middle-end/50907
* function.c (convert_jumps_to_returns): When redirecting an edge
succ to EXIT_BLOCK_PTR, clear EDGE_CROSSING flag.
* gcc.dg/tree-prof/pr50907.c: New test.
From-SVN: r181787
---
gcc/ChangeLog | 4 ++++
gcc/function.c | 1 +
gcc/testsuite/ChangeLog | 3 +++
gcc/testsuite/gcc.dg/tree-prof/pr50907.c | 5 +++++
4 files changed, 13 insertions(+)
create mode 100644 gcc/testsuite/gcc.dg/tree-prof/pr50907.c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c66ec827e0b6..8b978c0364ef 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 664858a29e3b..6cf67c036d2a 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 ee4a71492a83..5a9275cf30e9 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 000000000000..2ba26e392cbb
--- /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"
--
GitLab