aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorChristian Bruel <christian.bruel@st.com>2015-04-14 14:14:04 +0200
committerChristian Bruel <chrbr@gcc.gnu.org>2015-04-14 14:14:04 +0200
commit703fa2e60966cc14ea7c994ec106957fc3558263 (patch)
tree5b555c5627dc6d0c7b289f3d35d2db0bd9f48c15 /gcc
parent4db56dfe7a3e4cb95d55a4433eebaa83fc4b8e09 (diff)
downloadgcc-703fa2e60966cc14ea7c994ec106957fc3558263.zip
gcc-703fa2e60966cc14ea7c994ec106957fc3558263.tar.gz
gcc-703fa2e60966cc14ea7c994ec106957fc3558263.tar.bz2
15-04-14 Christian Bruel <christian.bruel@st.com>
* execute_dwarf2_frame (dw_frame_pointer_regnum): Reinitialize for each function. From-SVN: r222084
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/dwarf2cfi.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f44fd64..71d31b9 100644
--- 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 27474cb..ec2acc9 100644
--- 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 ();