This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[patch, fortran] PR34540 cshift, eoshift, kind=1 and kind=2 arguments...
- From: Jerry DeLisle <jvdelisle at verizon dot net>
- To: Fortran List <fortran at gcc dot gnu dot org>
- Cc: gcc-patches <gcc-patches at gcc dot gnu dot org>
- Date: Fri, 21 Dec 2007 15:25:33 -0800
- Subject: [patch, fortran] PR34540 cshift, eoshift, kind=1 and kind=2 arguments...
Hi all,
I plan to commit this patch under the obvious and simple rule. Sorry for the
breakage. :)
Regression tested on x86-64-linux-gnu. New test case derived from Thomas test case.
Jerry
2007-12-21 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/34540
* iresolve.c (gfc_resolve_cshift): Take optional dim path
only if the argument is an optional itself.
* iresolve.c (gfc_resolve_eoshift): Same.
! { dg-do run }
! PR34540 cshift, eoshift, kind=1 and kind=2 arguments...
program main
integer(kind=1) :: d1
integer(kind=2) :: d2
integer(kind=4) :: d4
integer(kind=8) :: d8
integer(kind=1), dimension(2) :: s1
integer(kind=2), dimension(2) :: s2
integer(kind=4), dimension(2) :: s4
integer(kind=8), dimension(2) :: s8
real, dimension(2,2) :: r, r1, r2
data r /1.0, 2.0, 3.0, 4.0/
data r1 /2.0, 0.0, 4.0, 0.0/
data r2 /2.0, 1.0, 4.0, 3.0/
s1 = (/1, 1/)
s2 = (/1, 1/)
s4 = (/1, 1/)
s8 = (/1, 1/)
d1 = 1
d2 = 1
d4 = 1
d8 = 1
if (any(eoshift(r,shift=s1,dim=d1) /= r1)) call abort
if (any(eoshift(r,shift=s2,dim=d2) /= r1)) call abort
if (any(eoshift(r,shift=s4,dim=d4) /= r1)) call abort
if (any(eoshift(r,shift=s8,dim=d8) /= r1)) call abort
if (any(cshift(r,shift=s1,dim=d1) /= r2)) call abort
if (any(cshift(r,shift=s2,dim=d2) /= r2)) call abort
if (any(cshift(r,shift=s4,dim=d4) /= r2)) call abort
if (any(cshift(r,shift=s8,dim=d8) /= r2)) call abort
end program main
Index: iresolve.c
===================================================================
--- iresolve.c (revision 131125)
+++ iresolve.c (working copy)
@@ -590,7 +590,7 @@ gfc_resolve_cshift (gfc_expr *f, gfc_exp
if (dim != NULL)
{
- if (dim->expr_type != EXPR_CONSTANT)
+ if (dim->expr_type != EXPR_CONSTANT && dim->symtree->n.sym->attr.optional)
{
/* Mark this for later setting the type in gfc_conv_missing_dummy. */
dim->representation.length = shift->ts.kind;
@@ -728,7 +728,7 @@ gfc_resolve_eoshift (gfc_expr *f, gfc_ex
if (dim != NULL)
{
- if (dim->expr_type != EXPR_CONSTANT)
+ if (dim->expr_type != EXPR_CONSTANT && dim->symtree->n.sym->attr.optional)
{
/* Mark this for later setting the type in gfc_conv_missing_dummy. */
dim->representation.length = shift->ts.kind;