aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorTom de Vries <tom@codesourcery.com>2011-11-22 20:55:01 +0000
committerTom de Vries <vries@gcc.gnu.org>2011-11-22 20:55:01 +0000
commit2db036a74e64d79cf7f1a23527ed720add2fa4b7 (patch)
tree737e03bbd0a1a9e5ecb2b417e9a01a85cc4cf2e1 /gcc
parent8733916b600980c3c3b2603f7127dbf10c8a09f5 (diff)
downloadgcc-2db036a74e64d79cf7f1a23527ed720add2fa4b7.zip
gcc-2db036a74e64d79cf7f1a23527ed720add2fa4b7.tar.gz
gcc-2db036a74e64d79cf7f1a23527ed720add2fa4b7.tar.bz2
re PR rtl-optimization/50764 (ICE: in maybe_record_trace_start, at dwarf2cfi.c:2243 with -O2 -fsched2-use-superblocks -ftree-tail-merge)
2011-11-22 Tom de Vries <tom@codesourcery.com> PR rtl-optimization/50764 * sched-deps.c (sched_analyze_insn): Make sure frame-related insns are not moved past preceding jump. From-SVN: r181639
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/sched-deps.c10
2 files changed, 14 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df93891..4c7eca4d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-22 Tom de Vries <tom@codesourcery.com>
+
+ PR rtl-optimization/50764
+ * sched-deps.c (sched_analyze_insn): Make sure frame-related insns are
+ not moved past preceding jump.
+
2011-11-22 Jeff Law <law@redhat.com>
* doc/contrib.texi: Add entry for David Binderman.
diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index a778721..043204a 100644
--- a/gcc/sched-deps.c
+++ b/gcc/sched-deps.c
@@ -2812,8 +2812,14 @@ sched_analyze_insn (struct deps_desc *deps, rtx x, rtx insn)
during prologue generation and avoid marking the frame pointer setup
as frame-related at all. */
if (RTX_FRAME_RELATED_P (insn))
- deps->sched_before_next_jump
- = alloc_INSN_LIST (insn, deps->sched_before_next_jump);
+ {
+ /* Make sure prologue insn is scheduled before next jump. */
+ deps->sched_before_next_jump
+ = alloc_INSN_LIST (insn, deps->sched_before_next_jump);
+
+ /* Make sure epilogue insn is scheduled after preceding jumps. */
+ add_dependence_list (insn, deps->pending_jump_insns, 1, REG_DEP_ANTI);
+ }
if (code == COND_EXEC)
{