From 89ea02fbac98156915e26567a21668dd816b4e3a Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 17 Dec 2002 16:29:29 -0500 Subject: calls.c (expand_call): Handle CALL_EXPR_HAS_RETURN_SLOT_ADDR with special struct-return ABIs. * calls.c (expand_call): Handle CALL_EXPR_HAS_RETURN_SLOT_ADDR with special struct-return ABIs. cp/ * semantics.c (simplify_aggr_init_exprs_r): Don't change the type of the CALL_EXPR. From-SVN: r60223 --- gcc/calls.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gcc/calls.c') diff --git a/gcc/calls.c b/gcc/calls.c index 4d6cdd7..09398e8 100644 --- a/gcc/calls.c +++ b/gcc/calls.c @@ -2248,8 +2248,20 @@ expand_call (exp, target, ignore) struct_value_size = int_size_in_bytes (TREE_TYPE (exp)); if (CALL_EXPR_HAS_RETURN_SLOT_ADDR (exp)) - /* The structure value address arg is already in actparms. */ - structure_value_addr_parm = 1; + { + /* The structure value address arg is already in actparms. */ + if (struct_value_rtx == 0) + /* We want to pass it as a normal argument, so leave it. */ + structure_value_addr_parm = 1; + else + { + /* We want to pass it in a special location. */ + tree return_arg = TREE_VALUE (actparms); + actparms = TREE_CHAIN (actparms); + structure_value_addr = expand_expr (return_arg, struct_value_rtx, + VOIDmode, EXPAND_NORMAL); + } + } else if (target && GET_CODE (target) == MEM) structure_value_addr = XEXP (target, 0); else -- cgit v1.1