summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fischer <aldot@gcc.gnu.org>2007-02-11 01:26:56 +0100
committerJerry DeLisle <jvdelisle@gcc.gnu.org>2007-02-11 00:26:56 +0000
commit31dedd4c2dd17e70da67c2a147985db7f5da8f9a (patch)
treef888685c383e89aeb59428ebb5e28f922ee115b1
parentb5d67022d0ec98fc7dd2384941da184bef64fd35 (diff)
downloadgcc-31dedd4c2dd17e70da67c2a147985db7f5da8f9a.tar.gz
backport: re PR fortran/24783 ([4.1 and 4.2 only] Implicit none in module overwrite explicit in procedure)
2007-02-10 Bernhard Fischer <aldot@gcc.gnu.org> Backport from trunk: PR fortran/24783 * gfortran.dg/implicit_10.f90: New test. From-SVN: r121813
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/gfortran.dg/implicit_10.f9033
2 files changed, 39 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 10b62ee6090..19da28d9911 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-10 Bernhard Fischer <aldot@gcc.gnu.org>
+
+ Backport from trunk:
+ PR fortran/24783
+ * gfortran.dg/implicit_10.f90: New test.
+
2007-02-06 Mark Mitchell <mark@codesourcery.com>
PR c++/29487
diff --git a/gcc/testsuite/gfortran.dg/implicit_10.f90 b/gcc/testsuite/gfortran.dg/implicit_10.f90
new file mode 100644
index 00000000000..0f5094f4209
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/implicit_10.f90
@@ -0,0 +1,33 @@
+! { dg-do run }
+! Check fix for PR24783 where we did try to resolve the implicit type
+! from the wrong namespace thus rejecting valid code.
+ MODULE mod1
+ IMPLICIT NONE
+ CONTAINS
+ SUBROUTINE sub(vec, ny)
+ IMPLICIT REAL (a-h,o-z)
+ IMPLICIT INTEGER (i-n)
+ DIMENSION vec(ny)
+ ny = fun(vec(ny),1,1)
+ RETURN
+ END SUBROUTINE sub
+ REAL FUNCTION fun(r1, i1, i2)
+ IMPLICIT REAL (r,f)
+ IMPLICIT INTEGER (i)
+ DIMENSION r1(i1:i2)
+ r1(i1) = i1 + 1
+ r1(i2) = i2 + 1
+ fun = r1(i1) + r1(i2)
+ END FUNCTION fun
+ END MODULE mod1
+
+ use mod1
+ IMPLICIT REAL (d)
+ INTEGER i
+ dimension di(5)
+ i = 1
+ if (fun(di(i),1,2).NE.5) call abort()
+ call sub(di(i),i)
+ if (i.NE.4) call abort()
+ end
+! { dg-final { cleanup-modules "mod1" } }