* loop-invariant.c (may_assign_reg_p): Return false for frame pointer.

From-SVN: r259683

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 27e56f233e49293c9ef2ccc17e925192b61a238d..431201358a3b85268f2477ab0cff1f36a6c50842 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * loop-invariant.c (may_assign_reg_p): Return false for frame pointer.
+
 2018-04-26  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/i386/i386.md ("isa" attribute): Add x64_sse2.

diff --git a/gcc/loop-invariant.c b/gcc/loop-invariant.c
index bd31a51c1d59e12220ab77778743fccce74eb8b7..e3b2eda1695d6b80202ced7c23847a39ee4a3aa3 100644 (file)
--- a/gcc/loop-invariant.c
+++ b/gcc/loop-invariant.c
@@ -660,6 +660,9 @@ may_assign_reg_p (rtx x)
   return (GET_MODE (x) != VOIDmode
          && GET_MODE (x) != BLKmode
          && can_copy_p (GET_MODE (x))
+         /* Do not mess with the frame pointer adjustments that can
+            be generated e.g. by expand_builtin_setjmp_receiver.  */
+         && x != frame_pointer_rtx
          && (!REG_P (x)
              || !HARD_REGISTER_P (x)
              || REGNO_REG_CLASS (REGNO (x)) != NO_REGS));

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a4d32ec2574ceb3a63d9a1c92c7f0215120652ce..0e0332513ef29477a78682cf718636e8d39b82f1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gnat.dg/loop_optimization24.adb: New test.
+
 2018-04-26  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/85116

diff --git a/gcc/testsuite/gnat.dg/loop_optimization24.adb b/gcc/testsuite/gnat.dg/loop_optimization24.adb
new file mode 100644 (file)
index 0000000..641d28e
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/loop_optimization24.adb
@@ -0,0 +1,35 @@
+-- { dg-do run }\r
+-- { dg-options "-O" }\r
+\r
+procedure Loop_Optimization24 is\r
+\r
+   procedure Callback is\r
+   begin\r
+      raise Constraint_Error;\r
+   end;\r
+\r
+   type Thread_Name_Ptr is access constant String;\r
+   type Callback_Ptr is access procedure;\r
+\r
+   type Callback_Information is record\r
+      Name : Thread_Name_Ptr;\r
+      Proc : Callback_Ptr;\r
+   end record;\r
+      \r
+   type Callback_List is array (Positive range <>) of Callback_Information;\r
+\r
+   Cbs : Callback_List\r
+     := (1 => (Proc => Callback'access, name => new String'("Callback")),\r
+         2 => (Proc => Callback'access, name => new String'("Callback")));\r
+\r
+begin\r
+   for Index in Cbs'Range loop\r
+      begin\r
+         if Cbs(Index).proc /= null then\r
+            Cbs(Index).proc.all;\r
+         end if;\r
+      exception\r
+         when Constraint_Error => null;\r
+      end;\r
+   end loop;\r
+end;\r