diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2018-09-28 21:20:53 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2018-09-28 21:20:53 +0000 |
| commit | 44662f681e8be6b3b7eafcec4afa0ecb8cc587cd (patch) | |
| tree | 1c0470d4d2c3d3ea333d09879f17a86087934d93 /gcc/ada/gcc-interface/decl.c | |
| parent | 5c441345a343d0ef90e5ac9ef95039030ecef1ee (diff) | |
| download | gcc-44662f681e8be6b3b7eafcec4afa0ecb8cc587cd.zip gcc-44662f681e8be6b3b7eafcec4afa0ecb8cc587cd.tar.gz gcc-44662f681e8be6b3b7eafcec4afa0ecb8cc587cd.tar.bz2 | |
calls.c (expand_call): Try to do a tail call for thunks at -O0 too.
* calls.c (expand_call): Try to do a tail call for thunks at -O0 too.
* cgraph.h (struct cgraph_thunk_info): Add indirect_offset.
(cgraph_node::create_thunk): Add indirect_offset parameter.
(thunk_adjust): Likewise.
* cgraph.c (cgraph_node::create_thunk): Add indirect_offset parameter
and initialize the corresponding field with it.
(cgraph_node::dump): Dump indirect_offset field.
* cgraphclones.c (duplicate_thunk_for_node): Deal with indirect_offset.
* cgraphunit.c (cgraph_node::analyze): Be prepared for external thunks.
(thunk_adjust): Add indirect_offset parameter and deal with it.
(cgraph_node::expand_thunk): Deal with the indirect_offset field and
pass it to thunk_adjust. Do not call the target hook if it's non-zero
or if the thunk is external or local. Fix formatting. Do not chain
the RESULT_DECL to BLOCK_VARS. Pass the static chain to the target,
if any, in the GIMPLE representation.
* ipa-icf.c (sem_function::equals_wpa): Deal with indirect_offset.
* lto-cgraph.c (lto_output_node): Write indirect_offset field.
(input_node): Read indirect_offset field.
* tree-inline.c (expand_call_inline): Pass indirect_offset field in the
call to thunk_adjust.
* tree-nested.c (struct nesting_info): Add thunk_p field.
(create_nesting_tree): Set it.
(convert_all_function_calls): Copy static chain from targets to thunks.
(finalize_nesting_tree_1): Return early for thunks.
(unnest_nesting_tree_1): Do not finalize thunks.
(gimplify_all_functions): Do not gimplify thunks.
cp/
* method.c (use_thunk): Adjust call to cgraph_node::create_thunk.
ada/
* gcc-interface/decl.c (is_cplusplus_method): Do not require C++
convention on Interfaces.
* gcc-interface/trans.c (Subprogram_Body_to_gnu): Try to create a
bona-fide thunk and hand it over to the middle-end.
(get_controlling_type): New function.
(use_alias_for_thunk_p): Likewise.
(thunk_labelno): New static variable.
(make_covariant_thunk): New function.
(maybe_make_gnu_thunk): Likewise.
* gcc-interface/utils.c (finish_subprog_decl): Set DECL_CONTEXT of the
result DECL here instead of...
(end_subprog_body): ...here.
Co-Authored-By: Pierre-Marie de Rodat <derodat@adacore.com>
From-SVN: r264701
Diffstat (limited to 'gcc/ada/gcc-interface/decl.c')
| -rw-r--r-- | gcc/ada/gcc-interface/decl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 8dd62f7..4a1845a 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -4851,15 +4851,15 @@ is_cplusplus_method (Entity_Id gnat_entity) if (Convention (gnat_entity) != Convention_CPP) return false; - /* And that the type of the first parameter (indirectly) has it too. */ + /* And that the type of the first parameter (indirectly) has it too, but + we make an exception for Interfaces because they need not be imported. */ Entity_Id gnat_first = First_Formal (gnat_entity); if (No (gnat_first)) return false; - Entity_Id gnat_type = Etype (gnat_first); if (Is_Access_Type (gnat_type)) gnat_type = Directly_Designated_Type (gnat_type); - if (Convention (gnat_type) != Convention_CPP) + if (Convention (gnat_type) != Convention_CPP && !Is_Interface (gnat_type)) return false; /* This is the main case: a C++ virtual method imported as a primitive |