From 35cc02b5c80ac6738c1a3362a822e3d7e4d0c587 Mon Sep 17 00:00:00 2001 From: aldyh Date: Tue, 5 Dec 2006 17:26:05 +0000 Subject: Merge gimple-tuples-branch into mainline. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@119546 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/trans-array.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'gcc/fortran/trans-array.c') diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 991fa1c18ea..0049ad5b54b 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -156,10 +156,18 @@ gfc_conv_descriptor_data_get (tree desc) return t; } -/* This provides WRITE access to the data field. */ +/* This provides WRITE access to the data field. + + TUPLES_P is true if we are generating tuples. + + This function gets called through the following macros: + gfc_conv_descriptor_data_set + gfc_conv_descriptor_data_set_tuples. */ void -gfc_conv_descriptor_data_set (stmtblock_t *block, tree desc, tree value) +gfc_conv_descriptor_data_set_internal (stmtblock_t *block, + tree desc, tree value, + bool tuples_p) { tree field, type, t; @@ -170,7 +178,7 @@ gfc_conv_descriptor_data_set (stmtblock_t *block, tree desc, tree value) gcc_assert (DATA_FIELD == 0); t = build3 (COMPONENT_REF, TREE_TYPE (field), desc, field, NULL_TREE); - gfc_add_modify_expr (block, t, fold_convert (TREE_TYPE (field), value)); + gfc_add_modify (block, t, fold_convert (TREE_TYPE (field), value), tuples_p); } -- cgit v1.2.3