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, 50 insertions, 0 deletions

diff --git a/gcc/testsuite/gfortran.dg/used_types_17.f90 b/gcc/testsuite/gfortran.dg/used_types_17.f90
new file mode 100644
index 000000000..964f37187
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/used_types_17.f90
@@ -0,0 +1,50 @@
+! { dg do-compile }
+! Tests the fix for PR31630, in which the association of the argument
+! of 'cmp' did not work.
+!
+! Contributed by Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
+!
+module box_module
+  type box
+    integer :: m = 0
+  end type box
+end module box_module
+
+module sort_box_module
+contains
+
+  subroutine heapsort_box(cmp)
+    interface
+       subroutine cmp(a)
+         use box_module
+         type(box) :: a
+       end subroutine cmp
+    end interface
+    optional :: cmp
+  end subroutine heapsort_box
+
+end module sort_box_module
+
+
+module boxarray_module
+  use box_module
+  implicit none
+
+  type boxarray
+    type(box), allocatable :: bxs(:)
+  end type boxarray
+contains
+
+  subroutine boxarray_build_l(ba)
+    type(boxarray) :: ba
+    allocate(ba%bxs(1))
+  end subroutine boxarray_build_l
+
+  subroutine boxarray_sort()
+    use sort_box_module
+    call heapsort_box
+  end subroutine boxarray_sort
+
+end module boxarray_module
+
+! { dg-final { cleanup-modules "box_module sort_box_module boxarray_module" } }