From: Tom de Vries <tom@codesourcery.com>
Date: Tue, 22 Nov 2011 20:55:01 +0000 (+0000)
Subject: re PR rtl-optimization/50764 (ICE: in maybe_record_trace_start, at dwarf2cfi.c:2243... 
X-Git-Tag: releases/gcc-4.7.0~2004
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2db036a74e64d79cf7f1a23527ed720add2fa4b7;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df9389119fbf..4c7eca4d7d99 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 a778721d20b2..043204a34bc8 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)
     {