diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2022-11-16 03:58:17 +0100 |
|---|---|---|
| committer | Marc Poulhiès <poulhies@adacore.com> | 2022-11-21 11:10:35 +0100 |
| commit | 2473f28d79c480192aba783a08de8b0285c08213 (patch) | |
| tree | 3ab3e312c54782f72ac38e0fb6e578c2cc80440b /gcc/ada/gcc-interface/trans.cc | |
| parent | a186dd158decad693bd18c95962a9ea61022166c (diff) | |
| download | gcc-2473f28d79c480192aba783a08de8b0285c08213.zip gcc-2473f28d79c480192aba783a08de8b0285c08213.tar.gz gcc-2473f28d79c480192aba783a08de8b0285c08213.tar.bz2 | |
ada: Adjust recent change for returns involving function calls
gcc/ada/
* gcc-interface/decl.cc (gnat_to_gnu_entity) <E_Constant>: Revert
latest change.
* gcc-interface/trans.cc (gnat_to_gnu) <N_Object_Declaration>:
Tweak latest change.
Diffstat (limited to 'gcc/ada/gcc-interface/trans.cc')
| -rw-r--r-- | gcc/ada/gcc-interface/trans.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc index d0ff741..1cd621a 100644 --- a/gcc/ada/gcc-interface/trans.cc +++ b/gcc/ada/gcc-interface/trans.cc @@ -6482,9 +6482,10 @@ gnat_to_gnu (Node_Id gnat_node) then elide the temporary by forwarding the return object to Func: + result_type *Rnn = (result_type *) <retval>; *<retval> = Func (); [return slot optimization] [...] - return <retval>; + return Rnn; That's necessary if the result type needs finalization because the temporary would never be adjusted as Expand_Simple_Function_Return @@ -6496,8 +6497,12 @@ gnat_to_gnu (Node_Id gnat_node) && current_function_decl && TREE_ADDRESSABLE (TREE_TYPE (current_function_decl))) { - gnu_result = gnat_to_gnu_entity (gnat_temp, NULL_TREE, true); - gnu_result = build_unary_op (INDIRECT_REF, NULL_TREE, gnu_result); + gnat_to_gnu_entity (gnat_temp, + DECL_RESULT (current_function_decl), + true); + gnu_result + = build_unary_op (INDIRECT_REF, NULL_TREE, + DECL_RESULT (current_function_decl)); gnu_result = Call_to_gnu (Prefix (Expression (gnat_node)), &gnu_result_type, gnu_result, |