arm.c (arm_set_return_address): Mark the store as frame related, if any.

	* config/arm/arm.c (arm_set_return_address): Mark the store as frame
	related, if any.
	(thumb_set_return_address): Likewise.

From-SVN: r217251

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c2ec869d66a8a9cdcaaf6dec723cebc29c19943b..6bfc320d05c6568f1790985c8c1040b3cbff688c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-08  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * config/arm/arm.c (arm_set_return_address): Mark the store as frame
+       related, if any.
+       (thumb_set_return_address): Likewise.
+
 2014-11-07  Jeff Law  <law@redhat.com>
 
        PR tree-optimization/61515

diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index cc005d6c692bc169c4d6ee470bb533f98ec4f51b..05529520648fed65d46724973698c5aa7d3d6229 100644 (file)
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -29012,7 +29012,11 @@ arm_set_return_address (rtx source, rtx scratch)
 
          addr = plus_constant (Pmode, addr, delta);
        }
-      emit_move_insn (gen_frame_mem (Pmode, addr), source);
+      /* The store needs to be marked as frame related in order to prevent
+        DSE from deleting it as dead if it is based on fp.  */
+      rtx insn = emit_move_insn (gen_frame_mem (Pmode, addr), source);
+      RTX_FRAME_RELATED_P (insn) = 1;
+      add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (Pmode, LR_REGNUM));
     }
 }
 
@@ -29064,7 +29068,11 @@ thumb_set_return_address (rtx source, rtx scratch)
       else
        addr = plus_constant (Pmode, addr, delta);
 
-      emit_move_insn (gen_frame_mem (Pmode, addr), source);
+      /* The store needs to be marked as frame related in order to prevent
+        DSE from deleting it as dead if it is based on fp.  */
+      rtx insn = emit_move_insn (gen_frame_mem (Pmode, addr), source);
+      RTX_FRAME_RELATED_P (insn) = 1;
+      add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (Pmode, LR_REGNUM));
     }
   else
     emit_move_insn (gen_rtx_REG (Pmode, LR_REGNUM), source);