From a67cfde819ff41fafec5466008b7c95b3e97a7f9 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Mon, 4 Jun 2012 23:01:02 +0200 Subject: [PATCH] re PR fortran/50619 (Surprising interaction between -finit-real=NAN and the associate construct) 2012-06-04 Tobias Burnus PR fortran/50619 * resolve.c (build_default_init_expr): Don't initialize ASSOCIATE names. 2012-06-04 Tobias Burnus PR fortran/50619 * gfortran.dg/init_flag_10.f90: New. From-SVN: r188208 --- gcc/fortran/ChangeLog | 6 +++ gcc/fortran/resolve.c | 3 +- gcc/testsuite/ChangeLog | 5 +++ gcc/testsuite/gfortran.dg/init_flag_10.f90 | 43 ++++++++++++++++++++++ 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/init_flag_10.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a561a8c803e..b3342ab777e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2012-06-04 Tobias Burnus + + PR fortran/50619 + * resolve.c (build_default_init_expr): Don't initialize + ASSOCIATE names. + 2012-06-03 Alessandro Fanfarillo Tobias Burnus diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 3627b714a07..61a1381a073 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -10103,7 +10103,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 c2d248052a1..ab1bf33c58d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-06-04 Tobias Burnus + + PR fortran/50619 + * gfortran.dg/init_flag_10.f90: New. + 2012-06-04 Paolo Carlini PR c++/53524 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