From: krebbel Date: Fri, 19 Sep 2014 09:14:59 +0000 (+0000) Subject: 2014-09-19 Andreas Krebbel X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7c99e1adc0d4a0636ee4813204a90028fdbe075;p=thirdparty%2Fgcc.git 2014-09-19 Andreas Krebbel PR target/62662 * config/s390/s390.c (s390_emit_epilogue): When doing the return address load optimization force s390_optimize_prologue to leave it that way. Only do the optimization if we already decided to push r14 into a stack slot. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@215381 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ecfb1a66b408..f9a32f69ae1c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2014-09-19 Andreas Krebbel + + PR target/62662 + * config/s390/s390.c (s390_emit_epilogue): When doing the return + address load optimization force s390_optimize_prologue to leave it + that way. Only do the optimization if we already decided to push + r14 into a stack slot. + 2014-09-19 Marat Zakirov * asan.c (build_check_stmt): Alignment arg was added. diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 0997fb648cb9..481cd44a7564 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -9083,11 +9083,14 @@ s390_emit_epilogue (bool sibcall) if (! sibcall) { /* Fetch return address from stack before load multiple, - this will do good for scheduling. */ - - if (cfun_frame_layout.save_return_addr_p - || (cfun_frame_layout.first_restore_gpr < BASE_REGNUM - && cfun_frame_layout.last_restore_gpr > RETURN_REGNUM)) + this will do good for scheduling. + + Only do this if we already decided that r14 needs to be + saved to a stack slot. (And not just because r14 happens to + be in between two GPRs which need saving.) Otherwise it + would be difficult to take that decision back in + s390_optimize_prologue. */ + if (cfun_gpr_save_slot (RETURN_REGNUM) == -1) { int return_regnum = find_unused_clobbered_reg(); if (!return_regnum) @@ -9102,6 +9105,13 @@ s390_emit_epilogue (bool sibcall) addr = gen_rtx_MEM (Pmode, addr); set_mem_alias_set (addr, get_frame_alias_set ()); emit_move_insn (return_reg, addr); + + /* Once we did that optimization we have to make sure + s390_optimize_prologue does not try to remove the + store of r14 since we will not be able to find the + load issued here. */ + cfun_frame_layout.save_return_addr_p = true; + cfun_gpr_save_slot (RETURN_REGNUM) = -1; } }