From e49eac82e805ede5dd9b3c5d4ae9f8d90b0cc034 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 6 Feb 2024 12:57:38 +0100 Subject: ada: Avoid temporary for conditional expression of discriminated record type This just aligns the definite case (discriminants with default) with the indefinite case (discriminants without default), the latter case having been properly handled for long. In the former case, the maximum size is used so a temporary can be much larger than the actual data it contains. gcc/ada/ * gcc-interface/utils2.cc (build_cond_expr): Use the indirect path for all types containing a placeholder. --- gcc/ada/gcc-interface/utils2.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gcc') diff --git a/gcc/ada/gcc-interface/utils2.cc b/gcc/ada/gcc-interface/utils2.cc index a953b07..fb0ccf5 100644 --- a/gcc/ada/gcc-interface/utils2.cc +++ b/gcc/ada/gcc-interface/utils2.cc @@ -1715,8 +1715,8 @@ build_cond_expr (tree result_type, tree condition_operand, 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 - || TYPE_IS_BY_REFERENCE_P (result_type) - || CONTAINS_PLACEHOLDER_P (TYPE_SIZE (result_type))) + || type_contains_placeholder_p (result_type) + || TYPE_IS_BY_REFERENCE_P (result_type)) { result_type = build_pointer_type (result_type); true_operand = build_unary_op (ADDR_EXPR, result_type, true_operand); -- cgit v1.1