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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 165e362..bdca0af 100644 (file)
--- 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 c7d8183..a042273 100644 (file)
--- 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 5be018a..0b2f5aa 100644 (file)
--- 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 ();