From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Fri, 16 Aug 2019 16:31:13 +0000 (+0000)
Subject: backport: re PR tree-optimization/91109 ([arm] gcc.c-torture/execute/20040709-1.c... 
X-Git-Tag: releases/gcc-9.3.0~717
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caf4834ef8212f6db9f4b4e713ba84774e1eebd0;p=thirdparty%2Fgcc.git

backport: re PR tree-optimization/91109 ([arm] gcc.c-torture/execute/20040709-1.c fails since r273135)

2019-08-16  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        Backport from mainline
        2019-08-07  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        PR tree-optimization/91109
        * lra-remat.c (update_scratch_ops): Remove assignment of the
        hard register.

From-SVN: r274577
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4b8c1d1698f7..5aa430a241e1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-08-16  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	Backport from mainline
+	2019-08-07  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	PR tree-optimization/91109
+	* lra-remat.c (update_scratch_ops): Remove assignment of the
+	hard register.
+
 2019-08-15  Steve Ellcey  <sellcey@marvell.com>
 
 	Backport from mainline
diff --git a/gcc/lra-remat.c b/gcc/lra-remat.c
index 10838116143e..69209b2a18d3 100644
--- a/gcc/lra-remat.c
+++ b/gcc/lra-remat.c
@@ -1020,7 +1020,6 @@ get_hard_regs (struct lra_insn_reg *reg, int &nregs)
 static void
 update_scratch_ops (rtx_insn *remat_insn)
 {
-  int hard_regno;
   lra_insn_recog_data_t id = lra_get_insn_recog_data (remat_insn);
   struct lra_static_insn_data *static_id = id->insn_static_data;
   for (int i = 0; i < static_id->n_operands; i++)
@@ -1031,17 +1030,9 @@ update_scratch_ops (rtx_insn *remat_insn)
       int regno = REGNO (*loc);
       if (! lra_former_scratch_p (regno))
 	continue;
-      hard_regno = reg_renumber[regno];
       *loc = lra_create_new_reg (GET_MODE (*loc), *loc,
 				 lra_get_allocno_class (regno),
 				 "scratch pseudo copy");
-      if (hard_regno >= 0)
-	{
-	  reg_renumber[REGNO (*loc)] = hard_regno;
-	  if (lra_dump_file)
-	    fprintf (lra_dump_file, "	 Assigning the same %d to r%d\n",
-		     REGNO (*loc), hard_regno);
-	}
       lra_register_new_scratch_op (remat_insn, i, id->icode);
     }