diff options
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cfgexpand.c | 3 | ||||
| -rw-r--r-- | gcc/function.c | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7b8f8bd6651..51413c0edbc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2008-08-01 H.J. Lu <hongjiu.lu@intel.com> + + * cfgexpand.c (expand_stack_alignment): Assert that + stack_realign_drap and drap_rtx must match. + + * function.c (instantiate_new_reg): If DRAP is used to realign + stack, replace virtual_incoming_args_rtx with internal arg + pointer. + 2008-08-01 Richard Guenther <rguenther@suse.de> * tree-ssa-pre.c (fini_pre): Take in_fre parameter. Free diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index c9faa49d4ab..a943eff6ec1 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -2226,6 +2226,9 @@ expand_stack_alignment (void) gcc_assert (targetm.calls.get_drap_rtx != NULL); drap_rtx = targetm.calls.get_drap_rtx (); + /* stack_realign_drap and drap_rtx must match. */ + gcc_assert ((stack_realign_drap != 0) == (drap_rtx != NULL)); + /* Do nothing if NULL is returned, which means DRAP is not needed. */ if (NULL != drap_rtx) { diff --git a/gcc/function.c b/gcc/function.c index b9d9ec59cc0..637775160eb 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -1215,10 +1215,10 @@ instantiate_new_reg (rtx x, HOST_WIDE_INT *poffset) if (x == virtual_incoming_args_rtx) { - /* Replace virtual_incoming_args_rtx to internal arg pointer here */ - if (crtl->args.internal_arg_pointer != virtual_incoming_args_rtx) + if (stack_realign_drap) { - gcc_assert (stack_realign_drap); + /* Replace virtual_incoming_args_rtx with internal arg + pointer if DRAP is used to realign stack. */ new = crtl->args.internal_arg_pointer; offset = 0; } |