mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 12:01:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fortran: Fix func decl mismatch [PR93660]

Browse Source 
gcc/fortran/ChangeLog:

	PR fortran/93660
	* trans-decl.c (build_function_decl): Add comment;
	increment hidden_typelist for caf_token/caf_offset.
	* trans-types.c (gfc_get_function_type): Add comment;
	add missing caf_token/caf_offset args.

gcc/testsuite/ChangeLog:

	PR fortran/93660
	* gfortran.dg/gomp/declare-simd-coarray-lib.f90: New test.
This commit is contained in:
Tobias Burnus 2021-03-23 15:45:36 +01:00
parent d7cea7ceff
commit 212f4988f3
3 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/trans-decl.c
View File

@ -2488,7 +2488,9 @@ build_function_decl (gfc_symbol * sym, bool global)
}
/* Create the DECL_ARGUMENTS for a procedure. */
/* Create the DECL_ARGUMENTS for a procedure.
NOTE: The arguments added here must match the argument type created by
gfc_get_function_type (). */
static void
create_function_arglist (gfc_symbol * sym)
@ -2807,6 +2809,7 @@ create_function_arglist (gfc_symbol * sym)
DECL_ARG_TYPE (token) = TREE_VALUE (typelist);
TREE_READONLY (token) = 1;
hidden_arglist = chainon (hidden_arglist, token);
hidden_typelist = TREE_CHAIN (hidden_typelist);
gfc_finish_decl (token);
offset = build_decl (input_location, PARM_DECL,
@ -2832,6 +2835,7 @@ create_function_arglist (gfc_symbol * sym)
DECL_ARG_TYPE (offset) = TREE_VALUE (typelist);
TREE_READONLY (offset) = 1;
hidden_arglist = chainon (hidden_arglist, offset);
hidden_typelist = TREE_CHAIN (hidden_typelist);
gfc_finish_decl (offset);
}

21
gcc/fortran/trans-types.c
View File

@ -3011,6 +3011,10 @@ create_fn_spec (gfc_symbol *sym, tree fntype)
return build_type_attribute_variant (fntype, tmp);
}
/* NOTE: The returned function type must match the argument list created by
create_function_arglist. */
tree
gfc_get_function_type (gfc_symbol * sym, gfc_actual_arglist *actual_args,
const char *fnspec)
@ -3119,10 +3123,11 @@ gfc_get_function_type (gfc_symbol * sym, gfc_actual_arglist *actual_args,
}
}
/* Add hidden string length parameters. */
/* Add hidden arguments. */
for (f = gfc_sym_get_dummy_args (sym); f; f = f->next)
{
arg = f->sym;
/* Add hidden string length parameters. */
if (arg && arg->ts.type == BT_CHARACTER && !sym->attr.is_bind_c)
{
if (!arg->ts.deferred)
@ -3145,6 +3150,20 @@ gfc_get_function_type (gfc_symbol * sym, gfc_actual_arglist *actual_args,
&& arg->ts.type != BT_CLASS
&& !gfc_bt_struct (arg->ts.type))
vec_safe_push (typelist, boolean_type_node);
/* Coarrays which are descriptorless or assumed-shape pass with
-fcoarray=lib the token and the offset as hidden arguments. */
else if (arg
&& flag_coarray == GFC_FCOARRAY_LIB
&& ((arg->ts.type != BT_CLASS
&& arg->attr.codimension
&& !arg->attr.allocatable)
|| (arg->ts.type == BT_CLASS
&& CLASS_DATA (arg)->attr.codimension
&& !CLASS_DATA (arg)->attr.allocatable)))
{
vec_safe_push (typelist, pvoid_type_node); /* caf_token. */
vec_safe_push (typelist, gfc_array_index_type); /* caf_offset. */
}
}
if (!vec_safe_is_empty (typelist)

12
gcc/testsuite/gfortran.dg/gomp/declare-simd-coarray-lib.f90 Normal file
View File

@ -0,0 +1,12 @@
! { dg-additional-options "-fcoarray=lib" }
!
! PR fortran/93660
!
! Failed as TREE_TYPE(fndecl) did not include the
! hidden caf_token/caf_offset arguments.
!
integer function f(x)
integer :: x[*]
!$omp declare simd
f = x[1]
end