diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2015-03-23 07:53:31 +0000 |
|---|---|---|
| committer | Mikael Morin <mikael@gcc.gnu.org> | 2015-03-23 07:53:31 +0000 |
| commit | 30c931de07f8fcbe4ef3b550633c274fe7828975 (patch) | |
| tree | 59f7139307675a6ddd88e7d11153ba3460ac0019 /gcc/fortran/trans-array.c | |
| parent | af3eb1106883dffe6b1164070a00ad0c14df1146 (diff) | |
| download | gcc-30c931de07f8fcbe4ef3b550633c274fe7828975.zip gcc-30c931de07f8fcbe4ef3b550633c274fe7828975.tar.gz gcc-30c931de07f8fcbe4ef3b550633c274fe7828975.tar.bz2 | |
re PR fortran/64952 (Missing temporary in assignment from elemental function)
2015-03-23 Paul Thomas <pault@gcc.gnu.org>
Mikael Morin <mikael@gcc.gnu.org>
PR fortran/64952
fortran/
* gfortran.h (struct symbol_attribute) : New field
'array_outer_dependency'.
* trans.h (struct gfc_ss_info): New field 'array_outer_dependency'.
* module.c (enum ab_attribute): New value AB_ARRAY_OUTER_DEPENDENCY.
(attr_bits): Append same value to initializer.
(mio_symbol_attribute): Handle 'array_outer_dependency' attr
in module read and write.
* resolve.c (update_current_proc_outer_array_dependency): New function.
(resolve_function, resolve_call): Add code to update current procedure's
'array_outer_dependency' attribute.
(resolve_variable): Mark current procedure with attribute
array_outer_dependency if the variable is an array coming from outside
the current namespace.
(resolve_fl_procedure): Mark a procedure without body with attribute
'array_outer_dependency'.
* trans-array.c (gfc_conv_resolve_dependencies): If any ss is
marked as 'array_outer_dependency' generate a temporary.
(gfc_walk_function_expr): If the function may reference external arrays,
mark the head gfc_ss with flag 'array_outer_dependency'.
testsuite/
* gfortran.dg/elemental_dependency_4.f90: New.
* gfortran.dg/elemental_dependency_5.f90: New.
Co-Authored-By: Mikael Morin <mikael@gcc.gnu.org>
From-SVN: r221586
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 642110d..0dbfdaa 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -4391,6 +4391,12 @@ gfc_conv_resolve_dependencies (gfc_loopinfo * loop, gfc_ss * dest, { ss_expr = ss->info->expr; + if (ss->info->array_outer_dependency) + { + nDepend = 1; + break; + } + if (ss->info->type != GFC_SS_SECTION) { if (flag_realloc_lhs @@ -9096,9 +9102,20 @@ gfc_walk_function_expr (gfc_ss * ss, gfc_expr * expr) /* Walk the parameters of an elemental function. For now we always pass by reference. */ if (sym->attr.elemental || (comp && comp->attr.elemental)) - return gfc_walk_elemental_function_args (ss, expr->value.function.actual, + { + gfc_ss *old_ss = ss; + + ss = gfc_walk_elemental_function_args (old_ss, + expr->value.function.actual, gfc_get_proc_ifc_for_expr (expr), GFC_SS_REFERENCE); + if (ss != old_ss + && (comp + || sym->attr.proc_pointer + || sym->attr.if_source != IFSRC_DECL + || sym->attr.array_outer_dependency)) + ss->info->array_outer_dependency = 1; + } /* Scalar functions are OK as these are evaluated outside the scalarization loop. Pass back and let the caller deal with it. */ |