diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2023-06-21 00:50:40 +0200 |
|---|---|---|
| committer | Marc Poulhiès <poulhies@adacore.com> | 2023-06-27 14:05:52 +0200 |
| commit | 2ed0e911e40e1182d58d19e79cfed72c04d2fd66 (patch) | |
| tree | 0a552ffb8b9ec5f98f41355b979d124ad97fce94 /gcc/ada/gcc-interface | |
| parent | 388f22b92fe2218427e1b5ab5d29f51d037f2969 (diff) | |
| download | gcc-2ed0e911e40e1182d58d19e79cfed72c04d2fd66.zip gcc-2ed0e911e40e1182d58d19e79cfed72c04d2fd66.tar.gz gcc-2ed0e911e40e1182d58d19e79cfed72c04d2fd66.tar.bz2 | |
ada: Fix bad interaction between inlining and thunk generation
This may cause the type of the RESULT_DECL of a function which returns by
invisible reference to be turned into a reference type twice.
gcc/ada/
* gcc-interface/trans.cc (Subprogram_Body_to_gnu): Add guard to the
code turning the type of the RESULT_DECL into a reference type.
(maybe_make_gnu_thunk): Use a more precise guard in the same case.
Diffstat (limited to 'gcc/ada/gcc-interface')
| -rw-r--r-- | gcc/ada/gcc-interface/trans.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc index b74bb06..f5eadbb 100644 --- a/gcc/ada/gcc-interface/trans.cc +++ b/gcc/ada/gcc-interface/trans.cc @@ -3902,8 +3902,11 @@ Subprogram_Body_to_gnu (Node_Id gnat_node) gnu_return_var_elmt = NULL_TREE; /* If the function returns by invisible reference, make it explicit in the - function body. See gnat_to_gnu_subprog_type for more details. */ - if (TREE_ADDRESSABLE (gnu_subprog_type)) + function body, but beware that maybe_make_gnu_thunk may already have done + it if the function is inlined across units. See gnat_to_gnu_subprog_type + for more details. */ + if (TREE_ADDRESSABLE (gnu_subprog_type) + && TREE_CODE (TREE_TYPE (gnu_result_decl)) != REFERENCE_TYPE) { TREE_TYPE (gnu_result_decl) = build_reference_type (TREE_TYPE (gnu_result_decl)); @@ -11015,7 +11018,7 @@ maybe_make_gnu_thunk (Entity_Id gnat_thunk, tree gnu_thunk) same transformation as Subprogram_Body_to_gnu here. */ if (TREE_ADDRESSABLE (TREE_TYPE (gnu_target)) && DECL_EXTERNAL (gnu_target) - && !POINTER_TYPE_P (TREE_TYPE (DECL_RESULT (gnu_target)))) + && TREE_CODE (TREE_TYPE (DECL_RESULT (gnu_target))) != REFERENCE_TYPE) { TREE_TYPE (DECL_RESULT (gnu_target)) = build_reference_type (TREE_TYPE (DECL_RESULT (gnu_target))); |