From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 25 Jun 2018 17:19:13 +0000 (+0200)
Subject: backport: re PR target/83986 (ICE in maybe_record_trace_start, at dwarf2cfi.c:2348)
X-Git-Tag: releases/gcc-6.5.0~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=089adb5c12f03c4138aa482ba6f3db9cb0da235e;p=thirdparty%2Fgcc.git

backport: re PR target/83986 (ICE in maybe_record_trace_start, at dwarf2cfi.c:2348)

	Backported from mainline
	2018-01-30  Jakub Jelinek  <jakub@redhat.com>

	PR rtl-optimization/83986
	* sched-deps.c (sched_analyze_insn): For frame related insns, add anti
	dependence against last_pending_memory_flush in addition to
	pending_jump_insns.

	* gcc.dg/pr83986.c: New test.

From-SVN: r262059
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 25ecc5b76c3e..1695c7298d04 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,13 @@
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
 	Backported from mainline
+	2018-01-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/83986
+	* sched-deps.c (sched_analyze_insn): For frame related insns, add anti
+	dependence against last_pending_memory_flush in addition to
+	pending_jump_insns.
+
 	2018-01-27  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/84040
diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index 99f4a6fcdddf..1f8524cd11c1 100644
--- a/gcc/sched-deps.c
+++ b/gcc/sched-deps.c
@@ -2921,6 +2921,8 @@ sched_analyze_insn (struct deps_desc *deps, rtx x, rtx_insn *insn)
 	= alloc_INSN_LIST (insn, deps->sched_before_next_jump);
 
       /* Make sure epilogue insn is scheduled after preceding jumps.  */
+      add_dependence_list (insn, deps->last_pending_memory_flush, 1,
+			   REG_DEP_ANTI, true);
       add_dependence_list (insn, deps->pending_jump_insns, 1, REG_DEP_ANTI,
 			   true);
     }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 684e713900f5..4afc07b8991f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
 	Backported from mainline
+	2018-01-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/83986
+	* gcc.dg/pr83986.c: New test.
+
 	2018-01-23  Jakub Jelinek  <jakub@redhat.com>
 
 	PR sanitizer/83987
diff --git a/gcc/testsuite/gcc.dg/pr83986.c b/gcc/testsuite/gcc.dg/pr83986.c
new file mode 100644
index 000000000000..31a53d936163
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr83986.c
@@ -0,0 +1,14 @@
+/* PR rtl-optimization/83986 */
+/* { dg-do compile } */
+/* { dg-options "-g -O2 -fsched2-use-superblocks -funwind-tables --param max-pending-list-length=1" } */
+
+int v;
+
+int
+foo (int x)
+{
+  v &= !!v && !!x;
+  if (v != 0)
+    foo (0);
+  return 0;
+}