From cc2804f14fb5443a0ffa668ff8fe89c7a7bb7746 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Mon, 9 Jan 2006 20:42:26 +0000 Subject: [PATCH] trans-stmt.c (gfc_trans_pointer_assign_need_temp): Use fold_convert to avoid type mismatch. 2006-01-09 Andrew Pinski fortran/24936 * trans-stmt.c (gfc_trans_pointer_assign_need_temp): Use fold_convert to avoid type mismatch. 2006-01-09 Andrew Pinski fortran/24936 * gfortran.dg/forall_3.f90: New test. From-SVN: r109508 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-stmt.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/forall_3.f90 | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/forall_3.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9c92709abcb..44f6a481aeb 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2006-01-09 Andrew Pinski + + fortran/24936 + * trans-stmt.c (gfc_trans_pointer_assign_need_temp): Use fold_convert + to avoid type mismatch. + 2006-01-09 Andrew Pinski PR fortran/21977 diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index cf88918b586..df93db618b2 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 92f7e0205e5..d2a59cbc9f8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-01-09 Andrew Pinski + + fortran/24936 + * gfortran.dg/forall_3.f90: New test. + 2006-01-09 Andrew Pinski PR fortran/21977 diff --git a/gcc/testsuite/gfortran.dg/forall_3.f90 b/gcc/testsuite/gfortran.dg/forall_3.f90 new file mode 100644 index 00000000000..bc5e58c8077 --- /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 +