obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 30 insertions, 0 deletions

diff --git a/gcc/testsuite/gfortran.dg/module_read_1.f90 b/gcc/testsuite/gfortran.dg/module_read_1.f90
new file mode 100644
index 000000000..226c7366c
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/module_read_1.f90
@@ -0,0 +1,30 @@
+! { dg-do run }
+! { dg-options "-Wreturn-type" }
+! PR fortran/33941
+! The problem was that the intrinsic operators
+! were written to the module file as '/=' etc.
+! but this format was not understood on reading.
+!
+! Test case by Toby White, stripped down by
+! Dominique d'Humieres and Francois-Xavier Coudert
+
+module foo
+contains
+  function pop(n) result(item)          ! { dg-warning "not set" }
+    integer :: n
+    character(len=merge(1, 0, n > 0)) :: item
+  end function pop
+  function push(n) result(item)         ! { dg-warning "not set" }
+    integer :: n
+    character(len=merge(1, 0, n /= 0)) :: item
+  end function push
+end module foo
+
+program test
+  use foo
+  if(len(pop(0)) /= 0) call abort()
+  if(len(pop(1)) /= 1) call abort()
+  if(len(push(0)) /= 0) call abort()
+  if(len(push(1)) /= 1) call abort()
+end program
+! { dg-final { cleanup-modules "foo" } }