2012-09-13 Tobias Burnus <burnus@net-b.de>

        PR fortran/54556
        * resolve.c (resolve_formal_arglist): Allow VALUE arguments
        with implicit_pure.
        (gfc_impure_variable): Don't check gfc_pure such that the
        function also works for gfc_implicit_pure procedures.

2012-09-13  Tobias Burnus  <burnus@net-b.de>

        PR fortran/54556
        * gfortran.dg/implicit_pure_3.f90: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@191259 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 45f1c9f..21e7dbe 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2012-09-13  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/54556
+       * resolve.c (resolve_formal_arglist): Allow VALUE arguments
+       with implicit_pure.
+       (gfc_impure_variable): Don't check gfc_pure such that the
+       function also works for gfc_implicit_pure procedures.
+
 2012-09-12  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/54225

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 28eea5d..0748b6a 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -426,10 +426,12 @@ resolve_formal_arglist (gfc_symbol *proc)
            }
          else if (!sym->attr.pointer)
            {
-             if (proc->attr.function && sym->attr.intent != INTENT_IN)
+             if (proc->attr.function && sym->attr.intent != INTENT_IN
+                 && !sym->value)
                proc->attr.implicit_pure = 0;
 
-             if (proc->attr.subroutine && sym->attr.intent == INTENT_UNKNOWN)
+             if (proc->attr.subroutine && sym->attr.intent == INTENT_UNKNOWN
+                 && !sym->value)
                proc->attr.implicit_pure = 0;
            }
        }
@@ -13565,10 +13567,9 @@ gfc_impure_variable (gfc_symbol *sym)
     }
 
   proc = sym->ns->proc_name;
-  if (sym->attr.dummy && gfc_pure (proc)
-       && ((proc->attr.subroutine && sym->attr.intent == INTENT_IN)
-               ||
-            proc->attr.function))
+  if (sym->attr.dummy
+      && ((proc->attr.subroutine && sym->attr.intent == INTENT_IN)
+         || proc->attr.function))
     return 1;
 
   /* TODO: Sort out what can be storage associated, if anything, and include

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fa84318..d6c6e23 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-13  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/54556
+       * gfortran.dg/implicit_pure_3.f90: New.
+
 2012-09-13  Richard Guenther  <rguenther@suse.de>
 
        * gcc.dg/tree-ssa/ssa-fre-37.c: New testcase.

diff --git a/gcc/testsuite/gfortran.dg/implicit_pure_3.f90 b/gcc/testsuite/gfortran.dg/implicit_pure_3.f90
new file mode 100644 (file)
index 0000000..d9d7734
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/implicit_pure_3.f90
@@ -0,0 +1,109 @@
+! { dg-do compile }
+! { dg-options "-O2 -fdump-tree-optimized" }
+!
+! PR fortran/54556
+!
+! Contributed by Joost VandeVondele
+!
+MODULE parallel_rng_types
+
+  IMPLICIT NONE
+
+  ! Global parameters in this module
+  INTEGER, PARAMETER :: dp=8
+
+  TYPE rng_stream_type
+    PRIVATE
+    CHARACTER(LEN=40)             :: name
+    INTEGER                       :: distribution_type
+    REAL(KIND=dp), DIMENSION(3,2) :: bg,cg,ig
+    LOGICAL                       :: antithetic,extended_precision
+    REAL(KIND=dp)                 :: buffer
+    LOGICAL                       :: buffer_filled
+  END TYPE rng_stream_type
+
+  REAL(KIND=dp), DIMENSION(3,3) :: a1p0,a1p76,a1p127,&
+                                   a2p0,a2p76,a2p127,&
+                                   inv_a1,inv_a2
+
+  INTEGER, PARAMETER          :: GAUSSIAN = 1,&
+                                 UNIFORM  = 2
+
+  REAL(KIND=dp), PARAMETER :: norm  = 2.328306549295727688e-10_dp,&
+                              m1    = 4294967087.0_dp,&
+                              m2    = 4294944443.0_dp,&
+                              a12   = 1403580.0_dp,&
+                              a13n  = 810728.0_dp,&
+                              a21   = 527612.0_dp,&
+                              a23n  = 1370589.0_dp,&
+                              two17 = 131072.0_dp,&            ! 2**17
+                              two53 = 9007199254740992.0_dp,&  ! 2**53
+                              fact  = 5.9604644775390625e-8_dp ! 1/2**24
+
+
+CONTAINS
+
+  FUNCTION rn32(rng_stream) RESULT(u)
+
+    TYPE(rng_stream_type), POINTER           :: rng_stream
+    REAL(KIND=dp)                            :: u
+
+    INTEGER                                  :: k
+    REAL(KIND=dp)                            :: p1, p2
+
+! -------------------------------------------------------------------------
+! Component 1
+
+    p1 = a12*rng_stream%cg(2,1) - a13n*rng_stream%cg(1,1)
+    k = INT(p1/m1)
+    p1 = p1 - k*m1
+    IF (p1 < 0.0_dp) p1 = p1 + m1
+    rng_stream%cg(1,1) = rng_stream%cg(2,1)
+    rng_stream%cg(2,1) = rng_stream%cg(3,1)
+    rng_stream%cg(3,1) = p1
+
+    ! Component 2
+
+    p2 = a21*rng_stream%cg(3,2) - a23n*rng_stream%cg(1,2)
+    k = INT(p2/m2)
+    p2 = p2 - k*m2
+    IF (p2 < 0.0_dp) p2 = p2 + m2
+    rng_stream%cg(1,2) = rng_stream%cg(2,2)
+    rng_stream%cg(2,2) = rng_stream%cg(3,2)
+    rng_stream%cg(3,2) = p2
+
+    ! Combination
+
+    IF (p1 > p2) THEN
+      u = (p1 - p2)*norm
+    ELSE
+      u = (p1 - p2 + m1)*norm
+    END IF
+
+    IF (rng_stream%antithetic) u = 1.0_dp - u
+
+  END FUNCTION rn32
+
+! *****************************************************************************
+  FUNCTION rn53(rng_stream) RESULT(u)
+
+    TYPE(rng_stream_type), POINTER           :: rng_stream
+    REAL(KIND=dp)                            :: u
+
+    u = rn32(rng_stream)
+
+    IF (rng_stream%antithetic) THEN
+      u = u + (rn32(rng_stream) - 1.0_dp)*fact
+      IF (u < 0.0_dp) u = u + 1.0_dp
+    ELSE
+      u = u + rn32(rng_stream)*fact
+      IF (u >= 1.0_dp) u = u - 1.0_dp
+    END IF
+
+  END FUNCTION rn53
+
+END MODULE
+
+! { dg-final { scan-module-absence "parallel_rng_types" "IMPLICIT_PURE" } }
+! { dg-final { scan-tree-dump-times "rn32 \\(rng_stream" 3 "optimized" } }
+! { dg-final { cleanup-tree-dump "optimized" } }