From: Eric Botcazou Date: Sun, 11 Apr 2010 11:23:32 +0000 (+0000) Subject: utils2.c (build_cond_expr): Take the address and dereference if the result type is... X-Git-Tag: releases/gcc-4.6.0~7959 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87fa3d342b62a632f1e44008c18bc60a9ac90af1;p=thirdparty%2Fgcc.git utils2.c (build_cond_expr): Take the address and dereference if the result type is passed by reference. * gcc-interface/utils2.c (build_cond_expr): Take the address and dereference if the result type is passed by reference. From-SVN: r158201 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 364381179e89..626eb4f8b274 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2010-04-11 Eric Botcazou + + * gcc-interface/utils2.c (build_cond_expr): Take the address and + dereference if the result type is passed by reference. + 2010-04-11 Eric Botcazou * gcc-interface/trans.c (Case_Statement_to_gnu): Bool-ify variable. diff --git a/gcc/ada/gcc-interface/utils2.c b/gcc/ada/gcc-interface/utils2.c index a6ec65fd54d0..29d60daf3460 100644 --- a/gcc/ada/gcc-interface/utils2.c +++ b/gcc/ada/gcc-interface/utils2.c @@ -1291,10 +1291,12 @@ build_cond_expr (tree result_type, tree condition_operand, true_operand = convert (result_type, true_operand); false_operand = convert (result_type, false_operand); - /* If the result type is unconstrained, take the address of the operands - and then dereference our result. */ + /* If the result type is unconstrained, take the address of the operands and + then dereference the result. Likewise if the result type is passed by + reference because creating a temporary of this type is not allowed. */ if (TREE_CODE (result_type) == UNCONSTRAINED_ARRAY_TYPE - || CONTAINS_PLACEHOLDER_P (TYPE_SIZE (result_type))) + || CONTAINS_PLACEHOLDER_P (TYPE_SIZE (result_type)) + || (AGGREGATE_TYPE_P (result_type) && TYPE_BY_REFERENCE_P (result_type))) { result_type = build_pointer_type (result_type); true_operand = build_unary_op (ADDR_EXPR, result_type, true_operand);