aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Guenther <rguenther@suse.de>2009-09-09 20:03:49 +0000
committerPaul Thomas <pault@gcc.gnu.org>2009-09-09 20:03:49 +0000
commit39b747f2c91e32c50edc4f431e478ccec4bf91a2 (patch)
treea19a8bdf86821268cbf669ad6540120c995c46f2 /gcc
parent93fbf85741829968709ed17290ac5258eaee55d0 (diff)
downloadgcc-39b747f2c91e32c50edc4f431e478ccec4bf91a2.zip
gcc-39b747f2c91e32c50edc4f431e478ccec4bf91a2.tar.gz
gcc-39b747f2c91e32c50edc4f431e478ccec4bf91a2.tar.bz2
re PR fortran/41297 (Functions are called twice)
2009-09-09 Richard Guenther <rguenther@suse.de> PR fortran/41297 * trans-expr.c (gfc_trans_scalar_assign): Correct typo that left 'tmp' unused in derived type assignment. From-SVN: r151576
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/trans-expr.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d2a301d..c01c4b3 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-09 Richard Guenther <rguenther@suse.de>
+
+ 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 <tkoenig@gcc.gnu.org>
PR fortran/41197
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 3d675eb..b3642c2 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