This is the mail archive of the fortran@gcc.gnu.org mailing list for the GNU Fortran project.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
Hello, while reviewing Thomas' bound simplification patch, I noticed that the {l,u}bound simplification code wasn't handling array subcomponents. Fixed by the attached patch, regression tested. OK for trunk? Mikael
Attachment:
bound_simplify.CL
Description: Text document
Index: simplify.c =================================================================== --- simplify.c (révision 221972) +++ simplify.c (copie de travail) @@ -3338,7 +3338,7 @@ simplify_bound_dim (gfc_expr *array, gfc_expr *kin result = gfc_get_constant_expr (BT_INTEGER, k, &array->where); /* Then, we need to know the extent of the given dimension. */ - if (coarray || ref->u.ar.type == AR_FULL) + if (coarray || (ref->u.ar.type == AR_FULL && !ref->next)) { l = as->lower[d-1]; u = as->upper[d-1]; @@ -3417,11 +3417,8 @@ simplify_bound (gfc_expr *array, gfc_expr *dim, gf case AR_FULL: /* We're done because 'as' has already been set in the previous iteration. */ - if (!ref->next) - goto done; + goto done; - /* Fall through. */ - case AR_UNKNOWN: return NULL; @@ -3556,11 +3553,8 @@ simplify_cobound (gfc_expr *array, gfc_expr *dim, case AR_FULL: /* We're done because 'as' has already been set in the previous iteration. */ - if (!ref->next) - goto done; + goto done; - /* Fall through. */ - case AR_UNKNOWN: return NULL;
! { dg-do run } ! { dg-additional-options "-fcoarray=single -fdump-tree-original" } ! ! Check that {L,U}{,CO}BOUND intrinsics are properly simplified. ! type :: t integer :: c end type t type(t) :: d(3:8) = t(7) type(t) :: e[5:9,-1:*] if (lbound(d, 1) /= 3) call abort if (lbound(d(3:5), 1) /= 1) call abort if (lbound(d%c, 1) /= 1) call abort if (ubound(d, 1) /= 8) call abort if (ubound(d(3:5), 1) /= 3) call abort if (ubound(d%c, 1) /= 6) call abort if (lcobound(e, 1) /= 5) call abort if (lcobound(e%c, 1) /= 5) call abort if (lcobound(e, 2) /= -1) call abort if (lcobound(e%c, 2) /= -1) call abort if (ucobound(e, 1) /= 9) call abort if (ucobound(e%c, 1) /= 9) call abort ! no simplification for ucobound(e{,%c}, dim=2) end ! { dg-final { scan-tree-dump-not "bound" "original" } } ! { dg-final { scan-tree-dump-not "abort" "original" } } ! { dg-final { cleanup-tree-dump "original" } }
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |