From: H.J. Lu <hongjiu.lu@intel.com>
Date: Mon, 7 Nov 2011 16:38:24 +0000 (+0000)
Subject: Check HARD_FRAME_POINTER_REGNUM.
X-Git-Tag: upstream/12.2.0~79986
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b4d5595766deff664bba213f1236493e89cdf84;p=platform%2Fupstream%2Fgcc.git

Check HARD_FRAME_POINTER_REGNUM.

2011-11-07  H.J. Lu  <hongjiu.lu@intel.com>

	* dwarf2cfi.c (dwarf2out_frame_debug_expr): Check
	HARD_FRAME_POINTER_REGNUM instead of hard_frame_pointer_rtx
	in Rule 18.

From-SVN: r181096
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0bfd95a..4c7bdd5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* dwarf2cfi.c (dwarf2out_frame_debug_expr): Check
+	HARD_FRAME_POINTER_REGNUM instead of hard_frame_pointer_rtx
+	in Rule 18.
+
 2011-11-07  Jakub Jelinek  <jakub@redhat.com>
 
 	* config/i386/i386.c (ix86_expand_builtin): If gather mask
diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
index 4f44c77..69e6f21 100644
--- a/gcc/dwarf2cfi.c
+++ b/gcc/dwarf2cfi.c
@@ -1757,7 +1757,8 @@ dwarf2out_frame_debug_expr (rtx expr)
 	     regiser.  */
           if (fde
               && fde->stack_realign
-              && src == hard_frame_pointer_rtx)
+	      && REG_P (src)
+	      && REGNO (src) == HARD_FRAME_POINTER_REGNUM)
 	    {
 	      gcc_assert (cur_cfa->reg != dw_frame_pointer_regnum);
 	      cur_trace->cfa_store.offset = 0;