15-04-14 Christian Bruel <christian.bruel@st.com>

	* execute_dwarf2_frame (dw_frame_pointer_regnum): Reinitialize for each
	function.

From-SVN: r222084

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f44fd64533a4521679276d2c2dcf89973bd776c3..71d31b9b729d5a95ea17dca64739c08f9545bf35 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-14  Christian Bruel  <christian.bruel@st.com>
+
+       * execute_dwarf2_frame (dw_frame_pointer_regnum): Reinitialize for each
+       function.
+
 2015-04-14  Marc Glisse  <marc.glisse@inria.fr>
 
        PR tree-optimization/63387

diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
index 27474cba07d50eb04af27caeda94ed5299e9c991..ec2acc961d7516dad0f68cccc354b74554f6e19c 100644 (file)
--- a/gcc/dwarf2cfi.c
+++ b/gcc/dwarf2cfi.c
@@ -2941,7 +2941,6 @@ create_cie_data (void)
   dw_trace_info cie_trace;
 
   dw_stack_pointer_regnum = DWARF_FRAME_REGNUM (STACK_POINTER_REGNUM);
-  dw_frame_pointer_regnum = DWARF_FRAME_REGNUM (HARD_FRAME_POINTER_REGNUM);
 
   memset (&cie_trace, 0, sizeof (cie_trace));
   cur_trace = &cie_trace;
@@ -2994,6 +2993,9 @@ create_cie_data (void)
 static unsigned int
 execute_dwarf2_frame (void)
 {
+  /* Different HARD_FRAME_POINTER_REGNUM might coexist in the same file.  */
+  dw_frame_pointer_regnum = DWARF_FRAME_REGNUM (HARD_FRAME_POINTER_REGNUM);
+
   /* The first time we're called, compute the incoming frame state.  */
   if (cie_cfi_vec == NULL)
     create_cie_data ();