diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2007-10-29 14:13:44 +0000 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2007-10-29 15:13:44 +0100 |
| commit | 640670c7f4ec13d4ef3aab73f7b7ea7eb05b7a9d (patch) | |
| tree | 965c87505ca071b2707c92dabd1c972a1673e22b /gcc/fortran/dependency.c | |
| parent | a270181e4059512728c286f6aff14219354cf0cf (diff) | |
| download | gcc-640670c7f4ec13d4ef3aab73f7b7ea7eb05b7a9d.zip gcc-640670c7f4ec13d4ef3aab73f7b7ea7eb05b7a9d.tar.gz gcc-640670c7f4ec13d4ef3aab73f7b7ea7eb05b7a9d.tar.bz2 | |
[multiple changes]
2007-10-29 Paul Thomas <pault@gcc.gnu.org>
PR fortran/31217
PR fortran/33811
PR fortran/33686
* trans-array.c (gfc_conv_loop_setup): Send a complete type to
gfc_trans_create_temp_array if the temporary is character.
* trans-stmt.c (gfc_trans_assign_need_temp): Do likewise for
allocate_temp_for_forall_nest.
(forall_replace): New function.
(forall_replace_symtree): New function.
(forall_restore): New function.
(forall_restore_symtree): New function.
(forall_make_variable_temp): New function.
(check_forall_dependencies): New function.
(cleanup_forall_symtrees): New function.
gfc_trans_forall_1): Add and initialize pre and post blocks.
Call check_forall_dependencies to check for all dependencies
and either trigger second forall block to copy temporary or
copy lval, outside the forall construct and replace all
dependent references. After assignment clean-up and coalesce
the blocks at the end of the function.
* gfortran.h : Add prototypes for gfc_traverse_expr and
find_forall_index.
expr.c (gfc_traverse_expr): New function to traverse expression
and visit all subexpressions, under control of a logical flag,
a symbol and an integer pointer. The slave function is caller
defined and is only called on EXPR_VARIABLE.
(expr_set_symbols_referenced): Called by above to set symbols
referenced.
(gfc_expr_set_symbols_referenced): Rework of this function to
use two new functions above.
* resolve.c (find_forall_index): Rework with gfc_traverse_expr,
using forall_index.
(forall_index): New function used by previous.
* dependency.c (gfc_check_dependency): Use gfc_dep_resolver for
all references, not just REF_ARRAY.
(gfc_dep_resolver): Correct the logic for substrings so that
overlapping arrays are handled correctly.
2007-10-29 Paul Thomas <pault@gcc.gnu.org>
PR fortran/31217
PR fortran/33811
* gfortran.dg/forall_12.f90: New test.
PR fortran/33686
* gfortran.dg/forall_13.f90: New test.
From-SVN: r129720
Diffstat (limited to 'gcc/fortran/dependency.c')
| -rw-r--r-- | gcc/fortran/dependency.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c index 1c5bf04..29a5237 100644 --- a/gcc/fortran/dependency.c +++ b/gcc/fortran/dependency.c @@ -657,8 +657,7 @@ gfc_check_dependency (gfc_expr *expr1, gfc_expr *expr2, bool identical) /* Identical and disjoint ranges return 0, overlapping ranges return 1. */ - /* Return zero if we refer to the same full arrays. */ - if (expr1->ref->type == REF_ARRAY && expr2->ref->type == REF_ARRAY) + if (expr1->ref && expr2->ref) return gfc_dep_resolver (expr1->ref, expr2->ref); return 1; @@ -1197,8 +1196,9 @@ gfc_dep_resolver (gfc_ref *lref, gfc_ref *rref) break; case REF_SUBSTRING: - /* Substring overlaps are handled by the string assignment code. */ - return 0; + /* Substring overlaps are handled by the string assignment code + if there is not an underlying dependency. */ + return (fin_dep == GFC_DEP_OVERLAP) ? 1 : 0; case REF_ARRAY: if (lref->u.ar.dimen != rref->u.ar.dimen) |