diff options
Diffstat (limited to 'gcc/except.c')
-rw-r--r-- | gcc/except.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc/except.c b/gcc/except.c index 788f54ed34f..0a33b180bfa 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -2944,10 +2944,11 @@ rtx expand_builtin_frob_return_addr (addr_tree) tree addr_tree; { - rtx addr = expand_expr (addr_tree, NULL_RTX, Pmode, 0); + rtx addr = expand_expr (addr_tree, NULL_RTX, ptr_mode, 0); #ifdef POINTERS_EXTEND_UNSIGNED - addr = convert_memory_address (Pmode, addr); + if (GET_MODE (addr) != Pmode) + addr = convert_memory_address (Pmode, addr); #endif #ifdef RETURN_ADDR_OFFSET @@ -2971,8 +2972,11 @@ expand_builtin_eh_return (stackadj_tree, handler_tree) handler = expand_expr (handler_tree, cfun->eh->ehr_handler, VOIDmode, 0); #ifdef POINTERS_EXTEND_UNSIGNED - stackadj = convert_memory_address (Pmode, stackadj); - handler = convert_memory_address (Pmode, handler); + if (GET_MODE (stackadj) != Pmode) + stackadj = convert_memory_address (Pmode, stackadj); + + if (GET_MODE (handler) != Pmode) + handler = convert_memory_address (Pmode, handler); #endif if (! cfun->eh->ehr_label) |