summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2011-07-01 12:57:11 +0000
committerhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2011-07-01 12:57:11 +0000
commit21dc8b2bc65ccb999dcfdb5e383084f4c4ea0343 (patch)
treec0276f81c5779ba2a67c01881ec6b3d839a8a38f /gcc
parent9c4d99038790fb42360171207840c774b4c2dbfe (diff)
downloadgcc-21dc8b2bc65ccb999dcfdb5e383084f4c4ea0343.tar.gz
Use proper mode for stack save area.
2011-07-01 H.J. Lu <hongjiu.lu@intel.com> PR middle-end/48016 * explow.c (update_nonlocal_goto_save_area): Use proper mode for stack save area. * function.c (expand_function_start): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@175756 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/explow.c4
-rw-r--r--gcc/function.c5
3 files changed, 13 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 165e362f75a..bdca0af17fe 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-01 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR middle-end/48016
+ * explow.c (update_nonlocal_goto_save_area): Use proper mode
+ for stack save area.
+ * function.c (expand_function_start): Likewise.
+
2011-07-01 Richard Guenther <rguenther@suse.de>
PR middle-end/49596
diff --git a/gcc/explow.c b/gcc/explow.c
index c7d81838033..a042273ec94 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -1102,7 +1102,9 @@ update_nonlocal_goto_save_area (void)
first one is used for the frame pointer save; the rest are sized by
STACK_SAVEAREA_MODE. Create a reference to array index 1, the first
of the stack save area slots. */
- t_save = build4 (ARRAY_REF, ptr_type_node, cfun->nonlocal_goto_save_area,
+ t_save = build4 (ARRAY_REF,
+ TREE_TYPE (TREE_TYPE (cfun->nonlocal_goto_save_area)),
+ cfun->nonlocal_goto_save_area,
integer_one_node, NULL_TREE, NULL_TREE);
r_save = expand_expr (t_save, NULL_RTX, VOIDmode, EXPAND_WRITE);
diff --git a/gcc/function.c b/gcc/function.c
index 5be018afde7..0b2f5aa5c37 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -4782,11 +4782,12 @@ expand_function_start (tree subr)
if (!DECL_RTL_SET_P (var))
expand_decl (var);
- t_save = build4 (ARRAY_REF, ptr_type_node,
+ t_save = build4 (ARRAY_REF,
+ TREE_TYPE (TREE_TYPE (cfun->nonlocal_goto_save_area)),
cfun->nonlocal_goto_save_area,
integer_zero_node, NULL_TREE, NULL_TREE);
r_save = expand_expr (t_save, NULL_RTX, VOIDmode, EXPAND_WRITE);
- r_save = convert_memory_address (Pmode, r_save);
+ gcc_assert (GET_MODE (r_save) == Pmode);
emit_move_insn (r_save, targetm.builtin_setjmp_frame_value ());
update_nonlocal_goto_save_area ();