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

diff --git a/gcc/testsuite/gfortran.dg/alloc_comp_assign_5.f90 b/gcc/testsuite/gfortran.dg/alloc_comp_assign_5.f90
new file mode 100644
index 000000000..3cc3695c4
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/alloc_comp_assign_5.f90
@@ -0,0 +1,33 @@
+! { dg-do run }
+! { dg-options "-O2" }
+! Tests the fix for PR29428, in which the assignment of
+! a function result would result in the function being
+! called twice, if it were not a result by reference,
+! because of a spurious nullify in gfc_trans_scalar_assign.
+!
+! Contributed by Paul Thomas  <pault@gcc.gnu.org>
+!
+program test
+implicit none
+
+  type A
+    integer, allocatable :: j(:)
+  end type A
+
+  type(A):: x
+  integer :: ctr = 0
+
+  x = f()
+
+  if (ctr /= 1) call abort ()
+
+contains
+
+  function f()
+    type(A):: f
+      ctr = ctr + 1
+      f = A ((/1,2/))
+  end function f
+
+end program
+