OSDN Git Service

* gcc-interface/utils2.c (build_cond_expr): Take the address and
authorebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 11 Apr 2010 11:23:32 +0000 (11:23 +0000)
committerMasaki Muranaka <monaka@monami-software.com>
Sun, 23 May 2010 00:55:41 +0000 (09:55 +0900)
dereference if the result type is passed by reference.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158201 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ada/ChangeLog
gcc/ada/gcc-interface/utils2.c

index 3643811..626eb4f 100644 (file)
@@ -1,5 +1,10 @@
 2010-04-11  Eric Botcazou  <ebotcazou@adacore.com>
 
+       * 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  <ebotcazou@adacore.com>
+
        * gcc-interface/trans.c (Case_Statement_to_gnu): Bool-ify variable.
        (gnat_to_gnu) <N_Null_Statement>: When not optimizing, generate a
        goto to the next statement.
index a6ec65f..29d60da 100644 (file)
@@ -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);