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

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

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

        PR tree-optimization/91109
        * lra-int.h (lra_need_for_scratch_reg_p): Declare.
        * lra.c (lra): Use lra_need_for_scratch_reg_p.
        * lra-spills.c (lra_need_for_scratch_reg_p): New function.

From-SVN: r274578

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5aa430a241e19d317b597562fbd27dc7cb648bbb..2d2fa9425030705d37850ddb8ac2b18c64474e77 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,13 @@
 2019-08-16  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
        Backport from mainline
+       2019-08-16  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+       PR tree-optimization/91109
+       * lra-int.h (lra_need_for_scratch_reg_p): Declare.
+       * lra.c (lra): Use lra_need_for_scratch_reg_p.
+       * lra-spills.c (lra_need_for_scratch_reg_p): New function.
+
        2019-08-07  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
        PR tree-optimization/91109

diff --git a/gcc/lra-int.h b/gcc/lra-int.h
index d0a8facc50e5ec429fa5e3b6ddb0ef80fe6b22c7..253ae1e6cb06705f399611b5e051003320d0cd67 100644 (file)
--- a/gcc/lra-int.h
+++ b/gcc/lra-int.h
@@ -401,6 +401,7 @@ extern bool lra_coalesce (void);
 
 /* lra-spills.c:  */
 
+extern bool lra_need_for_scratch_reg_p (void);
 extern bool lra_need_for_spills_p (void);
 extern void lra_spill (void);
 extern void lra_final_code_change (void);

diff --git a/gcc/lra-spills.c b/gcc/lra-spills.c
index c19b76a579cf7285096031db1801059c6d578c7a..7a49c0779b87788234210471246ad82b6586194c 100644 (file)
--- a/gcc/lra-spills.c
+++ b/gcc/lra-spills.c
@@ -548,6 +548,19 @@ spill_pseudos (void)
     }
 }
 
+/* Return true if we need scratch reg assignments.  */
+bool
+lra_need_for_scratch_reg_p (void)
+{
+  int i; max_regno = max_reg_num ();
+
+  for (i = FIRST_PSEUDO_REGISTER; i < max_regno; i++)
+    if (lra_reg_info[i].nrefs != 0 && lra_get_regno_hard_regno (i) < 0
+       && lra_former_scratch_p (i))
+      return true;
+  return false;
+}
+
 /* Return true if we need to change some pseudos into memory.  */
 bool
 lra_need_for_spills_p (void)

diff --git a/gcc/lra.c b/gcc/lra.c
index bef2f676a78cf539594b6da79c5242d2d56e8a43..1d2578f8c127747a74d1fc7c6088062d5d5bd484 100644 (file)
--- a/gcc/lra.c
+++ b/gcc/lra.c
@@ -2587,7 +2587,11 @@ lra (FILE *f)
          lra_create_live_ranges (lra_reg_spill_p, true);
          live_p = true;
          if (! lra_need_for_spills_p ())
-           break;
+           {
+             if (lra_need_for_scratch_reg_p ())
+               continue;
+             break;
+           }
        }
       lra_spill ();
       /* Assignment of stack slots changes elimination offsets for