aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/trans-stmt.c
diff options
context:
space:
mode:
authorPaul Thomas <pault@gcc.gnu.org>2018-10-18 10:37:39 +0000
committerPaul Thomas <pault@gcc.gnu.org>2018-10-18 10:37:39 +0000
commit75cdd535b1a47abdfc60a2950367fd4de7fae8ab (patch)
tree844e2779d07158b3f36767db7d316ce52f377f96 /gcc/fortran/trans-stmt.c
parent75a6d7da396ca7cecdc1b0e977203bb58a8ca024 (diff)
downloadgcc-75cdd535b1a47abdfc60a2950367fd4de7fae8ab.zip
gcc-75cdd535b1a47abdfc60a2950367fd4de7fae8ab.tar.gz
gcc-75cdd535b1a47abdfc60a2950367fd4de7fae8ab.tar.bz2
re PR fortran/58618 (Wrong code with character substring and ASSOCIATE)
2018-10-18 Paul Thomas <pault@gcc.gnu.org> PR fortran/58618 * trans-stmt.c (trans_associate_var): All strings that return as pointer types can be assigned directly to the associate name so remove 'attr' and the condition that uses it. 2018-10-18 Paul Thomas <pault@gcc.gnu.org> PR fortran/58618 * gfortran.dg/associate_45.f90 : New test. From-SVN: r265264
Diffstat (limited to 'gcc/fortran/trans-stmt.c')
-rw-r--r--gcc/fortran/trans-stmt.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index c778df0..00fdf19 100644
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -1656,7 +1656,6 @@ trans_associate_var (gfc_symbol *sym, gfc_wrapped_block *block)
bool need_len_assign;
bool whole_array = true;
gfc_ref *ref;
- symbol_attribute attr;
gcc_assert (sym->assoc);
e = sym->assoc->target;
@@ -1916,9 +1915,7 @@ trans_associate_var (gfc_symbol *sym, gfc_wrapped_block *block)
}
}
- attr = gfc_expr_attr (e);
if (sym->ts.type == BT_CHARACTER && e->ts.type == BT_CHARACTER
- && (attr.allocatable || attr.pointer || attr.dummy)
&& POINTER_TYPE_P (TREE_TYPE (se.expr)))
{
/* These are pointer types already. */
@@ -1926,8 +1923,8 @@ trans_associate_var (gfc_symbol *sym, gfc_wrapped_block *block)
}
else
{
- tmp = TREE_TYPE (sym->backend_decl);
- tmp = gfc_build_addr_expr (tmp, se.expr);
+ tmp = TREE_TYPE (sym->backend_decl);
+ tmp = gfc_build_addr_expr (tmp, se.expr);
}
gfc_add_modify (&se.pre, sym->backend_decl, tmp);