From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 8 Apr 2020 19:23:58 +0000 (+0200)
Subject: cselib, reload: Fix cselib ICE on m68k/microblaze [PR94526]
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d0cc1b79b39994c917abb23f71064bb39eedcc70;p=gcc.git

cselib, reload: Fix cselib ICE on m68k/microblaze [PR94526]

The following testcase ICEs on m68k (and another one Jeff mailed me
privately on microblaze).
The problem is that reload creates two DEBUG_INSNs with the same
value of (plus:P (reg:P sp) (const_int 0)), we compute correctly the
same hash value for them, but then don't find them in the cselib hash table,
as rtx_equal_for_cselib_1 thinks it is different from (reg:P sp),
and trigger an assertion failure that requires that from two different debug
insns one doesn't add locations to VALUEs.

The patch has two fixes for this, each fixes the ICE on both targets
separately, but I think we want both.

The cselib.c change ensures that rtx_equal_for_cselib_1 considers
(value:P sp_derived_value) and (plus:P (reg:P sp) (const_int 0)) equivalent.

The reload1.c change makes sure we don't create those bogus plus 0
expressions.  I understand the reasons for creating them, but they don't
really apply to DEBUG_INSNs; we don't have validity matching there, all we
care is that the expressions aren't arbitrarily deep, but it is just fine
to fold x + 0 into just x in there.

2020-04-08  Jakub Jelinek  <jakub@redhat.com>

	PR middle-end/94526
	* cselib.c (autoinc_split): Handle e->val_rtx being SP_DERIVED_VALUE_P
	with zero offset.
	* reload1.c (eliminate_regs_1): Avoid creating
	(plus (reg) (const_int 0)) in DEBUG_INSNs.

	* gcc.dg/pr94526.c: New test.
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dcdfae1ae8c..20fe7e2ac63 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2020-04-08  Jakub Jelinek  <jakub@redhat.com>
 
+	PR middle-end/94526
+	* cselib.c (autoinc_split): Handle e->val_rtx being SP_DERIVED_VALUE_P
+	with zero offset.
+	* reload1.c (eliminate_regs_1): Avoid creating
+	(plus (reg) (const_int 0)) in DEBUG_INSNs.
+
 	PR tree-optimization/94524
 	* tree-vect-generic.c (expand_vector_divmod): If any elt of op1 is
 	negative for signed TRUNC_MOD_EXPR, multiply with absolute value of
diff --git a/gcc/cselib.c b/gcc/cselib.c
index 69c9ca5b211..0de683617d1 100644
--- a/gcc/cselib.c
+++ b/gcc/cselib.c
@@ -884,21 +884,29 @@ autoinc_split (rtx x, rtx *off, machine_mode memmode)
       else
 	e = cselib_lookup (x, GET_MODE (x), 0, memmode);
       if (e)
-	for (struct elt_loc_list *l = e->locs; l; l = l->next)
-	  if (GET_CODE (l->loc) == PLUS
-	      && GET_CODE (XEXP (l->loc, 0)) == VALUE
-	      && SP_DERIVED_VALUE_P (XEXP (l->loc, 0))
-	      && CONST_INT_P (XEXP (l->loc, 1)))
+	{
+	  if (SP_DERIVED_VALUE_P (e->val_rtx)
+	      && (*off == NULL_RTX || *off == const0_rtx))
 	    {
-	      if (*off == NULL_RTX)
-		*off = XEXP (l->loc, 1);
-	      else
-		*off = plus_constant (Pmode, *off,
-				      INTVAL (XEXP (l->loc, 1)));
-	      if (*off == const0_rtx)
-		*off = NULL_RTX;
-	      return XEXP (l->loc, 0);
+	      *off = NULL_RTX;
+	      return e->val_rtx;
 	    }
+	  for (struct elt_loc_list *l = e->locs; l; l = l->next)
+	    if (GET_CODE (l->loc) == PLUS
+		&& GET_CODE (XEXP (l->loc, 0)) == VALUE
+		&& SP_DERIVED_VALUE_P (XEXP (l->loc, 0))
+		&& CONST_INT_P (XEXP (l->loc, 1)))
+	      {
+		if (*off == NULL_RTX)
+		  *off = XEXP (l->loc, 1);
+		else
+		  *off = plus_constant (Pmode, *off,
+					INTVAL (XEXP (l->loc, 1)));
+		if (*off == const0_rtx)
+		  *off = NULL_RTX;
+		return XEXP (l->loc, 0);
+	      }
+	}
     }
   return x;
 }
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 2f02c3e8636..88f4727d545 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -2607,8 +2607,9 @@ eliminate_regs_1 (rtx x, machine_mode mem_mode, rtx insn,
 		   structure of the insn in a way that reload can't handle.
 		   We special-case the commonest situation in
 		   eliminate_regs_in_insn, so just replace a PLUS with a
-		   PLUS here, unless inside a MEM.  */
-		if (mem_mode != 0
+		   PLUS here, unless inside a MEM.  In DEBUG_INSNs, it is
+		   always ok to replace a PLUS with just a REG.  */
+		if ((mem_mode != 0 || (insn && DEBUG_INSN_P (insn)))
 		    && CONST_INT_P (XEXP (x, 1))
 		    && known_eq (INTVAL (XEXP (x, 1)), -ep->previous_offset))
 		  return ep->to_rtx;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 134280d1369..6f26fc6cdc2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2020-04-08  Jakub Jelinek  <jakub@redhat.com>
 
+	PR middle-end/94526
+	* gcc.dg/pr94526.c: New test.
+
 	PR tree-optimization/94524
 	* gcc.c-torture/execute/pr94524-1.c: New test.
 	* gcc.c-torture/execute/pr94524-2.c: New test.
diff --git a/gcc/testsuite/gcc.dg/pr94526.c b/gcc/testsuite/gcc.dg/pr94526.c
new file mode 100644
index 00000000000..9864c4c3113
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr94526.c
@@ -0,0 +1,21 @@
+/* PR middle-end/94526 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -g" } */
+
+struct S { int val[8 * sizeof (int)]; };
+
+void
+foo (struct S *x)
+{
+  struct S *a = x;
+}
+
+void baz (struct S);
+
+void
+bar (void)
+{
+  struct S b;
+  foo (&b);
+  baz (b);
+}