diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-stmt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/forall_3.f90 | 18 |
4 files changed, 31 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9c92709..44f6a48 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2006-01-09 Andrew Pinski <pinskia@physics.uc.edu> + fortran/24936 + * trans-stmt.c (gfc_trans_pointer_assign_need_temp): Use fold_convert + to avoid type mismatch. + +2006-01-09 Andrew Pinski <pinskia@physics.uc.edu> + PR fortran/21977 * trans-decl.c (gfc_generate_function_code): Move the NULLing of current_fake_result_decl down to below generate_local_vars. diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index cf88918..df93db6 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -2122,7 +2122,8 @@ gfc_trans_pointer_assign_need_temp (gfc_expr * expr1, gfc_expr * expr2, rse.want_pointer = 1; gfc_conv_expr (&rse, expr2); gfc_add_block_to_block (&body, &rse.pre); - gfc_add_modify_expr (&body, lse.expr, rse.expr); + gfc_add_modify_expr (&body, lse.expr, + fold_convert (TREE_TYPE (lse.expr), rse.expr)); gfc_add_block_to_block (&body, &rse.post); /* Increment count. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 92f7e02..d2a59cb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2006-01-09 Andrew Pinski <pinskia@physics.uc.edu> + fortran/24936 + * gfortran.dg/forall_3.f90: New test. + +2006-01-09 Andrew Pinski <pinskia@physics.uc.edu> + PR fortran/21977 * gfortran.dg/nesting_2.f90: New test. * gfortran.dg/nesting_3.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/forall_3.f90 b/gcc/testsuite/gfortran.dg/forall_3.f90 new file mode 100644 index 0000000..bc5e58c8 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/forall_3.f90 @@ -0,0 +1,18 @@ +! the problem here was that we had forgot to call +! fold_convert in gfc_trans_pointer_assign_need_temp +! so that we got a pointer to char instead of a +! pointer to an array +! we really don't need a temp here. +! { dg-do compile } + + program test_forall + type element + character(32), pointer :: name + end type element + type(element) :: charts(50) + character(32), target :: names(50) + forall(i=1:50) + charts(i)%name => names(i) + end forall + end + |