From 0b8f2ce42dad5ee2bd3121e9cdcd522b6541b698 Mon Sep 17 00:00:00 2001 From: Roger Sayle Date: Fri, 3 Mar 2006 21:43:08 +0000 Subject: dependency.c (gfc_check_dependency): Call gfc_dep_resolver to check whether two array references have a dependency. * dependency.c (gfc_check_dependency): Call gfc_dep_resolver to check whether two array references have a dependency. (gfc_check_element_vs_element): Assume lref and rref must be REF_ARRAYs. If gfc_dep_compare_expr returns -2, assume these references could potentially overlap. (gfc_dep_resolver): Whitespace and comment tweaks. Assume a dependency if the references have different depths. Rewrite final term to clarrify we only have a dependency for overlaps. * gfortran.dg/dependency_4.f90: New test case. * gfortran.dg/dependency_5.f90: New test case. * gfortran.dg/dependency_6.f90: New test case. * gfortran.dg/dependency_7.f90: New test case. * gfortran.dg/dependency_8.f90: New test case. From-SVN: r111686 --- gcc/fortran/dependency.c | 50 +++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) (limited to 'gcc/fortran/dependency.c') diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c index f764873..187b207 100644 --- a/gcc/fortran/dependency.c +++ b/gcc/fortran/dependency.c @@ -460,16 +460,11 @@ gfc_check_dependency (gfc_expr * expr1, gfc_expr * expr2, bool identical) if (identical) return 1; - /* Identical ranges return 0, overlapping ranges return 1. */ - + /* 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 - && expr1->ref->u.ar.type == AR_FULL - && expr2->ref->u.ar.type == AR_FULL - && !expr1->ref->next - && !expr2->ref->next) - return 0; + if (expr1->ref->type == REF_ARRAY && expr2->ref->type == REF_ARRAY) + return gfc_dep_resolver (expr1->ref, expr2->ref); return 1; @@ -735,30 +730,25 @@ gfc_check_element_vs_element (gfc_ref * lref, gfc_ref * rref, int n) gfc_array_ref r_ar; gfc_expr *l_start; gfc_expr *r_start; - gfc_dependency nIsDep; - - if (lref->type == REF_ARRAY && rref->type == REF_ARRAY) - { - l_ar = lref->u.ar; - r_ar = rref->u.ar; - l_start = l_ar.start[n] ; - r_start = r_ar.start[n] ; - if (gfc_dep_compare_expr (r_start, l_start) == 0) - nIsDep = GFC_DEP_EQUAL; - else - nIsDep = GFC_DEP_NODEP; - } - else - nIsDep = GFC_DEP_NODEP; + int i; - return nIsDep; + l_ar = lref->u.ar; + r_ar = rref->u.ar; + l_start = l_ar.start[n] ; + r_start = r_ar.start[n] ; + i = gfc_dep_compare_expr (r_start, l_start); + if (i == 0) + return GFC_DEP_EQUAL; + if (i == -2) + return GFC_DEP_OVERLAP; + return GFC_DEP_NODEP; } /* Finds if two array references are overlapping or not. Return value 1 : array references are overlapping. - 0 : array references are not overlapping. */ + 0 : array references are identical or not overlapping. */ int gfc_dep_resolver (gfc_ref * lref, gfc_ref * rref) @@ -792,7 +782,6 @@ gfc_dep_resolver (gfc_ref * lref, gfc_ref * rref) return 0; case REF_ARRAY: - for (n=0; n < lref->u.ar.dimen; n++) { /* Assume dependency when either of array reference is vector @@ -844,9 +833,10 @@ gfc_dep_resolver (gfc_ref * lref, gfc_ref * rref) /* If we haven't seen any array refs then something went wrong. */ gcc_assert (fin_dep != GFC_DEP_ERROR); - if (fin_dep < GFC_DEP_OVERLAP) - return 0; - else + /* Assume the worst if we nest to different depths. */ + if (lref || rref) return 1; + + return fin_dep == GFC_DEP_OVERLAP; } -- cgit v1.1