summaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorpault <pault@138bc75d-0d04-0410-961f-82ee72b054a4>2015-08-01 18:37:25 +0000
committerpault <pault@138bc75d-0d04-0410-961f-82ee72b054a4>2015-08-01 18:37:25 +0000
commit814b1ca2f9b8898e4015dcc550b5d6b89dc10fed (patch)
tree20417056bc5e8bd339a994811594c59e555236ba /gcc/fortran
parent5955834f8d62c6f1d5f3921c6fd6c5e56032639b (diff)
downloadgcc-814b1ca2f9b8898e4015dcc550b5d6b89dc10fed.tar.gz
2015-08-01 Paul Thomas <pault@gcc.gnu.org>
PR fortran/67091 * trans-intrinsic.c (gfc_conv_associated): Add the pre and post blocks for the second argument to se. 2015-08-01 Paul Thomas <pault@gcc.gnu.org> PR fortran/67091 * gfortran.dg/associated_target_6.f03: New test git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@226464 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/trans-intrinsic.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e5b7681fa32..5bb70f1c68a 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-01 Paul Thomas <pault@gcc.gnu.org>
+
+ PR fortran/67091
+ * trans-intrinsic.c (gfc_conv_associated): Add the pre and post
+ blocks for the second argument to se.
+
2015-07-27 Thomas Schwinge <thomas@codesourcery.com>
* parse.c (parse_oacc_structured_block): Fix logic error.
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index 967a74169c8..1aa299be21a 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -6667,6 +6667,8 @@ gfc_conv_associated (gfc_se *se, gfc_expr *expr)
arg2se.expr);
gfc_add_block_to_block (&se->pre, &arg1se.pre);
gfc_add_block_to_block (&se->post, &arg1se.post);
+ gfc_add_block_to_block (&se->pre, &arg2se.pre);
+ gfc_add_block_to_block (&se->post, &arg2se.post);
tmp = fold_build2_loc (input_location, EQ_EXPR, boolean_type_node,
arg1se.expr, arg2se.expr);
tmp2 = fold_build2_loc (input_location, NE_EXPR, boolean_type_node,