diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-05 13:05:31 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-05 13:05:31 +0000 |
| commit | 393f80401ab3ef6836b2cd0a17e34662b3463aff (patch) | |
| tree | 0fd161e7f3add425b8cdeefe40018d8c2b60464c | |
| parent | 124d96b83ed8eeb08828d9b14e1925fe4b110eb1 (diff) | |
| download | gcc-393f80401ab3ef6836b2cd0a17e34662b3463aff.tar.gz | |
2012-06-05 Tobias Burnus <burnus@net-b.de>
PR fortran/50619
* resolve.c (build_default_init_expr): Don't initialize
ASSOCIATE names.
2012-06-05 Tobias Burnus <burnus@net-b.de>
PR fortran/50619
* gfortran.dg/init_flag_10.f90: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@188237 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/init_flag_10.f90 | 43 |
4 files changed, 56 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index c5654f63b69..0d779f93f34 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2012-06-05 Tobias Burnus <burnus@net-b.de> + + PR fortran/50619 + * resolve.c (build_default_init_expr): Don't initialize + ASSOCIATE names. + 2012-06-01 Tobias Burnus <burnus@net-b.de> PR fortran/53521 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 4ee70932bc8..3e795ce1639 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -9700,7 +9700,8 @@ build_default_init_expr (gfc_symbol *sym) || sym->attr.data || sym->module || sym->attr.cray_pointee - || sym->attr.cray_pointer) + || sym->attr.cray_pointer + || sym->assoc) return NULL; /* Now we'll try to build an initializer expression. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c5f0759ca4d..d838f8bfda3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-06-05 Tobias Burnus <burnus@net-b.de> + + PR fortran/50619 + * gfortran.dg/init_flag_10.f90: New. + 2012-06-04 Edmar Wienskoski <edmar@freescale.com> PR target/53559 diff --git a/gcc/testsuite/gfortran.dg/init_flag_10.f90 b/gcc/testsuite/gfortran.dg/init_flag_10.f90 new file mode 100644 index 00000000000..826a34b81ea --- /dev/null +++ b/gcc/testsuite/gfortran.dg/init_flag_10.f90 @@ -0,0 +1,43 @@ +! { dg-do run } +! { dg-options "-finit-real=NAN" } +! { dg-add-options ieee } +! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } } +! +! PR fortran/50619 +! +! Contributed by Fred Krogh +! +! The NaN initialization used to set the associate name to NaN! +! + +module testa2 +type, public :: test_ty + real :: rmult = 1.0e0 +end type test_ty + +contains + subroutine test(e, var1) + type(test_ty) :: e + real :: var1, var2 ! Should get NaN initialized + + ! Should be the default value + if (e%rmult /= 1.0) call abort () + + ! Check that NaN initialization is really turned on + if (var1 == var1) call abort () + if (var2 == var2) call abort () + + ! The following was failing: + associate (rmult=>e%rmult) + if (e%rmult /= 1.0) call abort () + end associate + end subroutine test +end module testa2 + +program testa1 + use testa2 + type(test_ty) :: e + real :: var1 ! Should get NaN initialized + call test(e, var1) + stop +end program testa1 |