From 6bbec3e1561a40c4b0870df42dbcbfc88be89dab Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 1 Jul 2011 12:57:11 +0000 Subject: [PATCH] Use proper mode for stack save area. 2011-07-01 H.J. Lu PR middle-end/48016 * explow.c (update_nonlocal_goto_save_area): Use proper mode for stack save area. * function.c (expand_function_start): Likewise. From-SVN: r175756 --- gcc/ChangeLog | 7 +++++++ gcc/explow.c | 4 +++- gcc/function.c | 5 +++-- 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 + + 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 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 (); -- 2.30.2