From 39b747f2c91e32c50edc4f431e478ccec4bf91a2 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Wed, 9 Sep 2009 20:03:49 +0000 Subject: [PATCH] re PR fortran/41297 (Functions are called twice) 2009-09-09 Richard Guenther PR fortran/41297 * trans-expr.c (gfc_trans_scalar_assign): Correct typo that left 'tmp' unused in derived type assignment. From-SVN: r151576 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-expr.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index d2a301db2b9..c01c4b351b0 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2009-09-09 Richard Guenther + + PR fortran/41297 + * trans-expr.c (gfc_trans_scalar_assign): Correct typo that + left 'tmp' unused in derived type assignment. + 2009-09-07 Thomas Koenig PR fortran/41197 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 3d675eb0499..b3642c2232c 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -4460,7 +4460,7 @@ gfc_trans_scalar_assign (gfc_se * lse, gfc_se * rse, gfc_typespec ts, gfc_add_block_to_block (&block, &lse->pre); gfc_add_block_to_block (&block, &rse->pre); tmp = gfc_evaluate_now (rse->expr, &block); - tmp = fold_build1 (VIEW_CONVERT_EXPR, TREE_TYPE (lse->expr), rse->expr); + tmp = fold_build1 (VIEW_CONVERT_EXPR, TREE_TYPE (lse->expr), tmp); gfc_add_modify (&block, lse->expr, tmp); } else