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

diff --git a/gcc/testsuite/gfortran.dg/altreturn_3.f90 b/gcc/testsuite/gfortran.dg/altreturn_3.f90
new file mode 100644
index 000000000..daa090178
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/altreturn_3.f90
@@ -0,0 +1,45 @@
+! { dg-do run }
+! { dg-options "-std=legacy" }
+!
+! Tests the fix for PR30236, which was due to alternate returns
+! in generic interfaces causing a segfault.  They now work
+! correctly.
+!
+! Contributed by Brooks Moses <brooks@gcc.gnu.org>
+!
+module arswitch
+  implicit none
+  interface gen
+    module procedure with
+    module procedure without
+  end interface
+contains
+  subroutine with(i,*)
+    integer i
+    if (i>0) then
+      i = -1
+      return 1
+    else
+      i = -2
+      return
+    end if
+  end subroutine
+  subroutine without()
+    return
+  end subroutine
+end module
+
+program test
+  use arswitch
+  implicit none
+  integer :: i = 0
+  call gen (i, *10)
+  if (i /= -2) call abort ()
+  i = 2
+  call gen (i, *20)
+ 10 continue
+  call abort()
+ 20 continue
+  if (i /= -1) call abort ()
+end
+! { dg-final { cleanup-modules "arswitch" } }