re PR fortran/39879 (double free or corruption abort with gfortran)

2009-05-10  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/39879
	* trans_expr.c (gfc_conv_procedure_call): Deep copy a derived
	type parentheses argument if it is a variable with allocatable
	components.

2009-05-10  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/39879
	* gfortran.dg/alloc_comp_assign_10.f90: New test.

From-SVN: r147346

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f85b1d7e3ad31fd594715a279d89b9127ee485cc..536148280f7927b674f7174fb673129659af4adc 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-10  Paul Thomas  <pault@gcc.gnu.org>
+
+       Backport from mainline:
+       PR fortran/39879
+       * trans_expr.c (gfc_conv_procedure_call): Deep copy a derived
+       type parentheses argument if it is a variable with allocatable
+       components.
+
 2009-04-04  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/39519

diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 116a1375accec3b1acf84af9b32a471919fc78d5..6575bdd58988fe795d50f70fb30e1beda4da8d71 100644 (file)
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -2564,7 +2564,18 @@ gfc_conv_function_call (gfc_se * se, gfc_symbol * sym,
              break;
            }
 
+         if (e->expr_type == EXPR_OP
+               && e->value.op.operator == INTRINSIC_PARENTHESES
+               && e->value.op.op1->expr_type == EXPR_VARIABLE)
+           {
+             tree local_tmp;
+             local_tmp = gfc_evaluate_now (tmp, &se->pre);
+             local_tmp = gfc_copy_alloc_comp (e->ts.derived, local_tmp, tmp, parm_rank);
+             gfc_add_expr_to_block (&se->post, local_tmp);
+           }
+
          tmp = gfc_deallocate_alloc_comp (e->ts.derived, tmp, parm_rank);
+
          gfc_add_expr_to_block (&se->post, tmp);
         }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4656576ae95672c5c99c1034b95b996b67a20b33..9bd9e34a88484ccb818240452777a25f82fa5558 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-10  Paul Thomas  <pault@gcc.gnu.org>
+
+       Backport from mainline:
+       PR fortran/39879
+       * gfortran.dg/alloc_comp_assign_10.f90: New test.
+
 2009-05-07  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/40057

diff --git a/gcc/testsuite/gfortran.dg/alloc_comp_assign_10.f90 b/gcc/testsuite/gfortran.dg/alloc_comp_assign_10.f90
new file mode 100644 (file)
index 0000000..c85edea
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/alloc_comp_assign_10.f90
@@ -0,0 +1,61 @@
+! { dg-do run }
+!
+! Test the fix for PR39879, in which gfc gagged on the double
+! defined assignment where the rhs had a default initialiser.
+!
+! Contributed by David Sagan <david.sagan@gmail.com>
+!
+module test_struct
+  interface assignment (=)
+    module procedure tao_lat_equal_tao_lat
+  end interface
+  type bunch_params_struct
+    integer n_live_particle          
+  end type
+  type tao_lattice_struct
+    type (bunch_params_struct), allocatable :: bunch_params(:)
+    type (bunch_params_struct), allocatable :: bunch_params2(:)
+  end type
+  type tao_universe_struct
+    type (tao_lattice_struct), pointer :: model, design
+    character(200), pointer :: descrip => NULL()
+  end type
+  type tao_super_universe_struct
+    type (tao_universe_struct), allocatable :: u(:)          
+  end type
+  type (tao_super_universe_struct), save, target :: s
+  contains
+    subroutine tao_lat_equal_tao_lat (lat1, lat2)
+      implicit none
+      type (tao_lattice_struct), intent(inout) :: lat1
+      type (tao_lattice_struct), intent(in) :: lat2
+      if (allocated(lat2%bunch_params)) then
+        lat1%bunch_params = lat2%bunch_params
+      end if 
+      if (allocated(lat2%bunch_params2)) then
+        lat1%bunch_params2 = lat2%bunch_params2
+      end if 
+    end subroutine
+end module
+
+program tao_program
+  use test_struct
+  implicit none
+  type (tao_universe_struct), pointer :: u
+  integer n, i
+  allocate (s%u(1))
+  u => s%u(1)
+  allocate (u%design, u%model)
+  n = 112
+  allocate (u%model%bunch_params(0:n), u%design%bunch_params(0:n))
+  u%design%bunch_params%n_live_particle = [(i, i = 0, n)]
+  u%model = u%design
+  u%model = u%design ! The double assignment was the cause of the ICE
+  if (.not. allocated (u%model%bunch_params)) call abort
+  if (any (u%model%bunch_params%n_live_particle .ne. [(i, i = 0, n)])) call abort
+  Deallocate (u%model%bunch_params, u%design%bunch_params)
+  deallocate (u%design, u%model)
+  deallocate (s%u)
+end program
+
+! { dg-final { cleanup-modules "test_struct" } }