Initial checkin of GCC 4.9.0 from trunk (r208799).

Change-Id: I48a3c08bb98542aa215912a75f03c0890e497dba

1 files changed, 51 insertions, 0 deletions

diff --git a/gcc-4.9/gcc/testsuite/gfortran.dg/result_in_spec_1.f90 b/gcc-4.9/gcc/testsuite/gfortran.dg/result_in_spec_1.f90
new file mode 100644
index 000000000..6189e5591
--- /dev/null
+++ b/gcc-4.9/gcc/testsuite/gfortran.dg/result_in_spec_1.f90
@@ -0,0 +1,51 @@
+! { dg-do run }
+! Tests the check for PR31215, in which actual/formal interface 
+! was not being correctly handled for the size of 'r' because
+! it is a result.
+!
+! Contributed by Joost VandeVondele <jv244@cam.ac.uk>
+!
+module test1
+  implicit none
+contains
+  character(f(x)) function test2(x) result(r)
+    implicit integer (x)
+    dimension r(len(r)+1)
+    integer, intent(in) :: x
+    interface
+      pure function f(x)
+        integer, intent(in) :: x
+        integer f
+      end function f
+    end interface
+    integer i
+    do i = 1, len(r)
+      r(:)(i:i) = achar(mod(i,32)+iachar('@'))
+    end do
+  end function test2
+end module test1
+
+program test
+  use test1
+  implicit none
+! Original problem
+  if (len(test2(10)) .ne. 21) call abort ()
+! Check non-intrinsic calls are OK and check that fix does
+! not confuse result variables.
+  if (any (myfunc (test2(1)) .ne. "ABC")) call abort ()
+contains
+  function myfunc (ch) result (chr)
+    character (*) :: ch(:)
+    character(len(ch)) :: chr(4)
+    if (len (ch) .ne. 3) call abort ()
+    if (any (ch .ne. "ABC")) call abort ()
+    chr = test2 (1)
+    if (len(test2(len(chr))) .ne. 7) call abort ()
+  end function myfunc
+end program test
+
+pure function f(x)
+  integer, intent(in) :: x
+  integer f
+  f = 2*x+1
+end function f