Testing for Convention_Intrinsic is not the proper way in order to spot
intrinsic subprograms, calling the predicate Is_Intrinsic_Subprogram is.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Subprogram_Type>:
Replace test on Convention_Intrinsic with Is_Intrinsic_Subprogram.
(gnat_to_gnu_param): Likewise.
(gnat_to_gnu_subprog_type): Likewise.
* gcc-interface/trans.c (elaborate_all_entities_for_package): Ditto.
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -3946,7 +3946,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition)
bool extern_flag
= ((Is_Public (gnat_entity) && !definition)
|| imported_p
- || (Convention (gnat_entity) == Convention_Intrinsic
+ || (Is_Intrinsic_Subprogram (gnat_entity)
&& Has_Pragma_Inline_Always (gnat_entity)));
tree gnu_param_list;
@@ -5366,7 +5366,7 @@ gnat_to_gnu_param (Entity_Id gnat_param, tree gnu_param_type, bool first,
/* Builtins are expanded inline and there is no real call sequence involved.
So the type expected by the underlying expander is always the type of the
argument "as is". */
- if (Convention (gnat_subprog) == Convention_Intrinsic
+ if (Is_Intrinsic_Subprogram (gnat_subprog)
&& Present (Interface_Name (gnat_subprog)))
mech = By_Copy;
@@ -5823,9 +5823,10 @@ gnat_to_gnu_subprog_type (Entity_Id gnat_subprog, bool definition,
else
{
- /* For foreign convention subprograms, return System.Address as void *
- or equivalent. Note that this comprises GCC builtins. */
- if (Has_Foreign_Convention (gnat_subprog)
+ /* For foreign convention/intrinsic subprograms, return System.Address
+ as void * or equivalent; this comprises GCC builtins. */
+ if ((Has_Foreign_Convention (gnat_subprog)
+ || Is_Intrinsic_Subprogram (gnat_subprog))
&& Is_Descendant_Of_Address (Underlying_Type (gnat_return_type)))
gnu_return_type = ptr_type_node;
else
@@ -5995,9 +5996,10 @@ gnat_to_gnu_subprog_type (Entity_Id gnat_subprog, bool definition,
{
Entity_Id gnat_param_type = Etype (gnat_param);
- /* For foreign convention subprograms, pass System.Address as void *
- or equivalent. Note that this comprises GCC builtins. */
- if (Has_Foreign_Convention (gnat_subprog)
+ /* For foreign convention/intrinsic subprograms, pass System.Address
+ as void * or equivalent; this comprises GCC builtins. */
+ if ((Has_Foreign_Convention (gnat_subprog)
+ || Is_Intrinsic_Subprogram (gnat_subprog))
&& Is_Descendant_Of_Address (Underlying_Type (gnat_param_type)))
gnu_param_type = ptr_type_node;
else
@@ -6303,7 +6305,7 @@ gnat_to_gnu_subprog_type (Entity_Id gnat_subprog, bool definition,
/* If this subprogram is expectedly bound to a GCC builtin, fetch the
corresponding DECL node and check the parameter association. */
- if (Convention (gnat_subprog) == Convention_Intrinsic
+ if (Is_Intrinsic_Subprogram (gnat_subprog)
&& Present (Interface_Name (gnat_subprog)))
{
tree gnu_ext_name = create_concat_name (gnat_subprog, NULL);
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -9079,7 +9079,7 @@ elaborate_all_entities_for_package (Entity_Id gnat_package)
continue;
/* Skip stuff internal to the compiler. */
- if (Convention (gnat_entity) == Convention_Intrinsic)
+ if (Is_Intrinsic_Subprogram (gnat_entity))
continue;
if (kind == E_Operator)
continue;