procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR fortran/51435 (Bad association status after null() of derived type component)

Browse source 
2011-12-06  Tobias Burnus  <burnus@net-b.de>

        PR fortran/51435
        * expr.c (gfc_has_default_initializer): Fix handling of
        DT with initialized pointer components.

2011-12-06  Tobias Burnus  <burnus@net-b.de>

        PR fortran/51435
        * gfortran.dg/default_initialization_5.f90: New.

From-SVN: r182059
This commit is contained in:
Tobias Burnus 2011-12-06 19:10:01 +01:00 • committed by Tobias Burnus
parent a032008aa9
commit 0173c67b30
4 changed files with 80 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View file

@ -1,3 +1,9 @@
2011-12-06 Tobias Burnus <burnus@net-b.de>
PR fortran/51435
* expr.c (gfc_has_default_initializer): Fix handling of
DT with initialized pointer components.
2011-12-05 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/51338

3
gcc/fortran/expr.c
View file

@ -3735,6 +3735,8 @@ gfc_has_default_initializer (gfc_symbol *der)
if (!c->attr.pointer
&& gfc_has_default_initializer (c->ts.u.derived))
return true;
if (c->attr.pointer && c->initializer)
return true;
}
else
{
@ -3745,6 +3747,7 @@ gfc_has_default_initializer (gfc_symbol *der)
return false;
}
/* Get an expression for a default initializer. */
gfc_expr *

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2011-12-06 Tobias Burnus <burnus@net-b.de>
PR fortran/51435
* gfortran.dg/default_initialization_5.f90: New.
2011-12-06 Jakub Jelinek <jakub@redhat.com>
PR target/51354

66
gcc/testsuite/gfortran.dg/default_initialization_5.f90 Normal file
View file

@ -0,0 +1,66 @@
! { dg-do run }
! { dg-options "-fdump-tree-original" }
!
! PR fortran/51435
!
! Contributed by darmar.xxl@gmail.com
!
module arr_m
type arr_t
real(8), dimension(:), allocatable :: rsk
end type
type arr_t2
integer :: a = 77
end type
end module arr_m
!*********************
module list_m
use arr_m
implicit none
type(arr_t2), target :: tgt
type my_list
type(arr_t), pointer :: head => null()
end type my_list
type my_list2
type(arr_t2), pointer :: head => tgt
end type my_list2
end module list_m
!***********************
module worker_mod
use list_m
implicit none
type data_all_t
type(my_list) :: my_data
end type data_all_t
type data_all_t2
type(my_list2) :: my_data
end type data_all_t2
contains
subroutine do_job()
type(data_all_t) :: dum
type(data_all_t2) :: dum2
if (associated(dum%my_data%head)) then
call abort()
else
print *, 'OK: do_job my_data%head is NOT associated'
end if
if (dum2%my_data%head%a /= 77) &
call abort()
end subroutine
end module
!***************
program hello
use worker_mod
implicit none
call do_job()
end program
! { dg-final { scan-tree-dump-times "my_data.head = 0B" 1 "original" } }
! { dg-final { scan-tree-dump-times "my_data.head = &tgt" 1 "original" } }
! { dg-final { cleanup-tree-dump "original" } }
! { dg-final { cleanup-modules "arr_m list_m worker_mod" } }