aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorDaniel Kraft <d@domob.eu>2010-07-22 12:59:31 +0200
committerDaniel Kraft <domob@gcc.gnu.org>2010-07-22 12:59:31 +0200
commitba3ff5c2dbb31cd2e058b4a830eaac1df668ca5b (patch)
tree9d88ad559f99a91e92b264c4ef86fbb333b4e69f /gcc
parent14ee5f0ae21190c98d7041311ba3c4640dda157a (diff)
downloadgcc-ba3ff5c2dbb31cd2e058b4a830eaac1df668ca5b.zip
gcc-ba3ff5c2dbb31cd2e058b4a830eaac1df668ca5b.tar.gz
gcc-ba3ff5c2dbb31cd2e058b4a830eaac1df668ca5b.tar.bz2
trans-stmt.c (gfc_trans_return): Put back in the handling of se.post, now in the correct place.
2010-07-22 Daniel Kraft <d@domob.eu> * trans-stmt.c (gfc_trans_return): Put back in the handling of se.post, now in the correct place. From-SVN: r162409
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/trans-stmt.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 1b3f555..ee2566d 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-22 Daniel Kraft <d@domob.eu>
+
+ * trans-stmt.c (gfc_trans_return): Put back in the handling of se.post,
+ now in the correct place.
+
2010-07-21 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/44929
diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index 8abdd88..019555a 100644
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -517,9 +517,13 @@ gfc_trans_return (gfc_code * code)
gfc_conv_expr (&se, code->expr1);
+ /* Note that the actually returned expression is a simple value and
+ does not depend on any pointers or such; thus we can clean-up with
+ se.post before returning. */
tmp = fold_build2 (MODIFY_EXPR, TREE_TYPE (result), result,
fold_convert (TREE_TYPE (result), se.expr));
gfc_add_expr_to_block (&se.pre, tmp);
+ gfc_add_block_to_block (&se.pre, &se.post);
tmp = gfc_generate_return ();
gfc_add_expr_to_block (&se.pre, tmp);