This is the mail archive of the
fortran@gcc.gnu.org
mailing list for the GNU Fortran project.
[Patch, fortran] PR34945 - LBOUND fails for array with KIND(complex) used in zero-sized dimension
- From: "Paul Richard Thomas" <paul dot richard dot thomas at gmail dot com>
- To: "fortran at gcc dot gnu dot org" <fortran at gcc dot gnu dot org>, gcc-patches <gcc-patches at gcc dot gnu dot org>
- Date: Sun, 3 Feb 2008 16:54:31 +0100
- Subject: [Patch, fortran] PR34945 - LBOUND fails for array with KIND(complex) used in zero-sized dimension
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to:subject:mime-version:content-type; bh=IvwbBt2D18lN/s7szSroVP75P9sklbl3R1vJBi52U+4=; b=X2H9N9PEYTbPaWL2JneYLoYLHCInjG4gHlXal8dth3t09HB7t0/BO7SG5S4Y82iyZATfWf8E2hkfCN4YUx6UTtXN1rVOkMs0Qwk1mBglhczioY8sMH7LCWPQmJb3wcjz7iJ54X5y+Yh3ztS7A202T2VhCcf1S75DEv1Y6/AGcXg=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:mime-version:content-type; b=ia4cHQ2Dx2UjEcL0REI0G+7KGT26+VTyfAJyRmMdNWpV3duuXh4LxwnXGQyJckN7UuIslJLjYzYH3tqxL1scBTDK1W+cOZQ/3zjCNr9lTFX5TfEfRSk5tSTFx9KL4Pam085eJZIddpYxzYOS/Hm+o00F7NMpGyhg4RxaYBDhjbI=
:ADDPATCH fortran:
This is one of the four remaining "F95" bugs. Again, the problem is
due to jumping the gun and trying to do checks before expressions are
resolved. Here, the check for negative array size was moved from
matching to resolution, so that we can be sure that every expression
that can be simplified has had it done.
Bootstraps and regtests on x86_ia64 - OK for 4.4 when it opens?
Cheers
Paul
2008-02-03 Paul Thomas <pault@gcc.gnu.org>
PR fortran/34945
* array.c (match_array_element_spec): Remove check for negative
array size.
(gfc_resolve_array_spec): Add check for negative size.
2008-02-03 Paul Thomas <pault@gcc.gnu.org>
PR fortran/34945
* gfortran.dg/bounds_check_13.f: New test.
Index: gcc/fortran/array.c
===================================================================
*** gcc/fortran/array.c (revision 132077)
--- gcc/fortran/array.c (working copy)
*************** gfc_resolve_array_spec (gfc_array_spec *
*** 250,255 ****
--- 250,270 ----
e = as->upper[i];
if (resolve_array_bound (e, check_constant) == FAILURE)
return FAILURE;
+
+ if ((as->lower[i] == NULL) || (as->upper[i] == NULL))
+ continue;
+
+ /* If the size is negative in this dimension, set it to zero. */
+ if (as->lower[i]->expr_type == EXPR_CONSTANT
+ && as->upper[i]->expr_type == EXPR_CONSTANT
+ && mpz_cmp (as->upper[i]->value.integer,
+ as->lower[i]->value.integer) < 0)
+ {
+ gfc_free_expr (as->upper[i]);
+ as->upper[i] = gfc_copy_expr (as->lower[i]);
+ mpz_sub_ui (as->upper[i]->value.integer,
+ as->upper[i]->value.integer, 1);
+ }
}
return SUCCESS;
*************** match_array_element_spec (gfc_array_spec
*** 318,332 ****
if (m == MATCH_NO)
return AS_ASSUMED_SHAPE;
- /* If the size is negative in this dimension, set it to zero. */
- if ((*lower)->expr_type == EXPR_CONSTANT
- && (*upper)->expr_type == EXPR_CONSTANT
- && mpz_cmp ((*upper)->value.integer, (*lower)->value.integer) < 0)
- {
- gfc_free_expr (*upper);
- *upper = gfc_copy_expr (*lower);
- mpz_sub_ui ((*upper)->value.integer, (*upper)->value.integer, 1);
- }
return AS_EXPLICIT;
}
--- 333,338 ----
Index: gcc/testsuite/gfortran.dg/bounds_check_13.f
===================================================================
*** gcc/testsuite/gfortran.dg/bounds_check_13.f (revision 0)
--- gcc/testsuite/gfortran.dg/bounds_check_13.f (revision 0)
***************
*** 0 ****
--- 1,21 ----
+ ! { dg-do compile }
+ ! Tests the fix for PR34945, in which the lbound = KIND(YDA) was not resolved
+ ! in time to set the size of TEST_ARRAY to zero.
+ !
+ ! Contributed by Dick Hendrickson <dick.hendrickson@gmail.com>
+ !
+ SUBROUTINE VF0009(IDA1,IDA2,YDA,HDA)
+ INTEGER(4) IDA1(4)
+ INTEGER(4) IDA2(4)
+ COMPLEX(8) YDA(2)
+ INTEGER(4) HDA(3)
+ ! I N I T I A L I Z A T I O N S E C T I O N
+ COMPLEX(KIND=4) :: TEST_ARRAY
+ $( 4:5,
+ $ KIND(YDA):5,
+ $ 4:5,
+ $ 4:5 )
+ ! T E S T S T A T E M E N T S
+ IDA1(1:4) = LBOUND(TEST_ARRAY)
+ END SUBROUTINE
+