From cba2d79f3eb821eca3e1052e5421247c1c4e2f5a Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Tue, 24 Jun 2008 22:42:10 +0000 Subject: [PATCH] re PR middle-end/36594 (multiple regressions on powerpc at rev.136976) 2008-06-24 Andrew Pinski PR middle-end/36594 * builtins.c (expand_builtin_nonlocal_goto): Stabilize the address of the memory instead of the memory itself for the save area. From-SVN: r137089 --- gcc/ChangeLog | 6 ++++++ gcc/builtins.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1ee4650db49..c68706eeb9b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-06-24 Andrew Pinski + + PR middle-end/36594 + * builtins.c (expand_builtin_nonlocal_goto): Stabilize the address of + the memory instead of the memory itself for the save area. + 2008-06-24 Olivier Hainque Nicolas Roche diff --git a/gcc/builtins.c b/gcc/builtins.c index cdc5ab31375..06ae07adaa9 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -873,6 +873,9 @@ expand_builtin_nonlocal_goto (tree exp) r_label = convert_memory_address (Pmode, r_label); r_save_area = expand_normal (t_save_area); r_save_area = convert_memory_address (Pmode, r_save_area); + /* Copy the address of the save location to a register just in case it was based + on the frame pointer. */ + r_save_area = copy_to_reg (r_save_area); r_fp = gen_rtx_MEM (Pmode, r_save_area); r_sp = gen_rtx_MEM (STACK_SAVEAREA_MODE (SAVE_NONLOCAL), plus_constant (r_save_area, GET_MODE_SIZE (Pmode))); @@ -887,7 +890,6 @@ expand_builtin_nonlocal_goto (tree exp) #endif { r_label = copy_to_reg (r_label); - r_sp = copy_to_reg (r_sp); emit_clobber (gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (VOIDmode))); emit_clobber (gen_rtx_MEM (BLKmode, hard_frame_pointer_rtx)); -- 2.30.2