aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorAndrew Pinski <pinskia@physics.uc.edu>2006-01-09 20:42:26 +0000
committerAndrew Pinski <pinskia@gcc.gnu.org>2006-01-09 12:42:26 -0800
commitcc2804f14fb5443a0ffa668ff8fe89c7a7bb7746 (patch)
treea5d3f403cbfa0722378e9d7854026ac228c089ec /gcc/fortran
parent76150104aa8575fb795aed3648046e22618bc2a3 (diff)
downloadgcc-cc2804f14fb5443a0ffa668ff8fe89c7a7bb7746.zip
gcc-cc2804f14fb5443a0ffa668ff8fe89c7a7bb7746.tar.gz
gcc-cc2804f14fb5443a0ffa668ff8fe89c7a7bb7746.tar.bz2
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> 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> fortran/24936 * gfortran.dg/forall_3.f90: New test. From-SVN: r109508
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/trans-stmt.c3
2 files changed, 8 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. */