From: burnus Date: Mon, 16 Jan 2012 19:51:44 +0000 (+0000) Subject: 2012-01-16 Mikael Morin X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=37446c626671d7b66bf5d9258cd8cdcb11d630f3 2012-01-16 Mikael Morin Tobias Burnus PR fortran/50981 * trans-array.c (gfc_walk_elemental_function_args): Fix passing of deallocated allocatables/pointers as absent argument. 2012-01-16 Mikael Morin Tobias Burnus PR fortran/50981 * gfortran.dg/elemental_optional_args_3.f90: New * gfortran.dg/elemental_optional_args_4.f90: New git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@183220 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4fd31382f56..a4838ab6331 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2012-01-16 Mikael Morin + Tobias Burnus + + PR fortran/50981 + * trans-array.c (gfc_walk_elemental_function_args): Fix + passing of deallocated allocatables/pointers as absent argument. + 2012-01-16 Tobias Burnus PR fortran/51809 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 6dcd5318a5f..b4ed58fe084 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -8423,9 +8423,10 @@ gfc_walk_elemental_function_args (gfc_ss * ss, gfc_actual_arglist *arg, if (dummy_arg != NULL && dummy_arg->sym->attr.optional - && arg->expr->symtree - && arg->expr->symtree->n.sym->attr.optional - && arg->expr->ref == NULL) + && arg->expr->expr_type == EXPR_VARIABLE + && (gfc_expr_attr (arg->expr).optional + || gfc_expr_attr (arg->expr).allocatable + || gfc_expr_attr (arg->expr).pointer)) newss->info->data.scalar.can_be_null_ref = true; } else diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b9054531065..82f9dd35e1f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2012-01-16 Mikael Morin + Tobias Burnus + + PR fortran/50981 + * gfortran.dg/elemental_optional_args_3.f90: New + * gfortran.dg/elemental_optional_args_4.f90: New + 2012-01-16 Tobias Burnus PR fortran/51809 diff --git a/gcc/testsuite/gfortran.dg/elemental_optional_args_3.f90 b/gcc/testsuite/gfortran.dg/elemental_optional_args_3.f90 new file mode 100644 index 00000000000..c1098b34eb9 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/elemental_optional_args_3.f90 @@ -0,0 +1,85 @@ +! { dg-do run } +! +! PR fortran/50981 +! The program used to dereference a NULL pointer when trying to access +! a pointer dummy argument to be passed to an elemental subprocedure. +! +! Original testcase from Andriy Kostyuk + +PROGRAM test + IMPLICIT NONE + REAL(KIND=8), DIMENSION(2) :: aa, rr + INTEGER, TARGET :: c + INTEGER, POINTER :: b + + aa(1)=10. + aa(2)=11. + + b=>c + b=1 + + ! WRITE(*,*) 'Both f1 and ff work if the optional parameter is present:' + + rr=f1(aa,b) + ! WRITE(*,*) ' rr(1)=', rr(1), ' rr(2)=', rr(2) + IF (ANY(rr /= (/ 110, 132 /))) CALL ABORT + + rr=0 + rr=ff(aa,b) + ! WRITE(*,*) ' rr(1)=', rr(1), ' rr(2)=', rr(2) + IF (ANY(rr /= (/ 110, 132 /))) CALL ABORT + + + b => NULL() + ! WRITE(*,*) 'But only f1 works if the optional parameter is absent:' + + rr=0 + rr=f1(aa, b) + ! WRITE(*,*) ' rr(1)=', rr(1), ' rr(2)=', rr(2) + IF (ANY(rr /= (/ 110, 132 /))) CALL ABORT + + rr = 0 + rr=ff(aa, b) + ! WRITE(*,*) ' rr(1)=', rr(1), ' rr(2)=', rr(2) + IF (ANY(rr /= (/ 110, 132 /))) CALL ABORT + + +CONTAINS + + FUNCTION ff(a,b) + IMPLICIT NONE + REAL(KIND=8), INTENT(IN) :: a(:) + REAL(KIND=8), DIMENSION(SIZE(a)) :: ff + INTEGER, INTENT(IN), POINTER :: b + REAL(KIND=8), DIMENSION(2, SIZE(a)) :: ac + ac(1,:)=a + ac(2,:)=a**2 + ff=SUM(gg(ac,b), dim=1) + END FUNCTION ff + + FUNCTION f1(a,b) + IMPLICIT NONE + REAL(KIND=8), INTENT(IN) :: a(:) + REAL(KIND=8), DIMENSION(SIZE(a)) :: f1 + INTEGER, INTENT(IN), POINTER :: b + REAL(KIND=8), DIMENSION(2, SIZE(a)) :: ac + ac(1,:)=a + ac(2,:)=a**2 + f1=gg(ac(1,:),b)+gg(ac(2,:),b) ! This is the same as in ff, but without using the elemental feature of gg + END FUNCTION f1 + + ELEMENTAL REAL(KIND=8) FUNCTION gg(a,b) + IMPLICIT NONE + REAL(KIND=8), INTENT(IN) :: a + INTEGER, INTENT(IN), OPTIONAL :: b + INTEGER ::b1 + IF(PRESENT(b)) THEN + b1=b + ELSE + b1=1 + ENDIF + gg=a**b1 + END FUNCTION gg + + +END PROGRAM test diff --git a/gcc/testsuite/gfortran.dg/elemental_optional_args_4.f90 b/gcc/testsuite/gfortran.dg/elemental_optional_args_4.f90 new file mode 100644 index 00000000000..fa359fb1b9d --- /dev/null +++ b/gcc/testsuite/gfortran.dg/elemental_optional_args_4.f90 @@ -0,0 +1,84 @@ +! { dg-do run } +! +! PR fortran/50981 +! The program used to dereference a NULL pointer when trying to access +! an allocatable dummy argument to be passed to an elemental subprocedure. +! +! Original testcase from Andriy Kostyuk + +PROGRAM test + IMPLICIT NONE + REAL(KIND=8), DIMENSION(2) :: aa, rr + INTEGER, ALLOCATABLE :: b + + aa(1)=10. + aa(2)=11. + + ALLOCATE(b) + b=1 + + ! WRITE(*,*) 'Both f1 and ff work if the optional parameter is present:' + + rr=f1(aa,b) + ! WRITE(*,*) ' rr(1)=', rr(1), ' rr(2)=', rr(2) + IF (ANY(rr /= (/ 110, 132 /))) CALL ABORT + + rr=0 + rr=ff(aa,b) + ! WRITE(*,*) ' rr(1)=', rr(1), ' rr(2)=', rr(2) + IF (ANY(rr /= (/ 110, 132 /))) CALL ABORT + + + DEALLOCATE(b) + ! WRITE(*,*) 'But only f1 works if the optional parameter is absent:' + + rr=0 + rr=f1(aa, b) + ! WRITE(*,*) ' rr(1)=', rr(1), ' rr(2)=', rr(2) + IF (ANY(rr /= (/ 110, 132 /))) CALL ABORT + + rr = 0 + rr=ff(aa, b) + ! WRITE(*,*) ' rr(1)=', rr(1), ' rr(2)=', rr(2) + IF (ANY(rr /= (/ 110, 132 /))) CALL ABORT + + +CONTAINS + + FUNCTION ff(a,b) + IMPLICIT NONE + REAL(KIND=8), INTENT(IN) :: a(:) + REAL(KIND=8), DIMENSION(SIZE(a)) :: ff + INTEGER, INTENT(IN), ALLOCATABLE :: b + REAL(KIND=8), DIMENSION(2, SIZE(a)) :: ac + ac(1,:)=a + ac(2,:)=a**2 + ff=SUM(gg(ac,b), dim=1) + END FUNCTION ff + + FUNCTION f1(a,b) + IMPLICIT NONE + REAL(KIND=8), INTENT(IN) :: a(:) + REAL(KIND=8), DIMENSION(SIZE(a)) :: f1 + INTEGER, INTENT(IN), ALLOCATABLE :: b + REAL(KIND=8), DIMENSION(2, SIZE(a)) :: ac + ac(1,:)=a + ac(2,:)=a**2 + f1=gg(ac(1,:),b)+gg(ac(2,:),b) ! This is the same as in ff, but without using the elemental feature of gg + END FUNCTION f1 + + ELEMENTAL REAL(KIND=8) FUNCTION gg(a,b) + IMPLICIT NONE + REAL(KIND=8), INTENT(IN) :: a + INTEGER, INTENT(IN), OPTIONAL :: b + INTEGER ::b1 + IF(PRESENT(b)) THEN + b1=b + ELSE + b1=1 + ENDIF + gg=a**b1 + END FUNCTION gg + + +END PROGRAM test