summaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/trans-array.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 39aa22df298..02f0141bebf 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,11 @@
2020-03-27 Tobias Burnus <tobias@codesourcery.com>
+ PR fortran/93957
+ * trans-array.c (gfc_alloc_allocatable_for_assignment): Accept
+ nonallocatable, nonpointer deferred-rank arrays.
+
+2020-03-27 Tobias Burnus <tobias@codesourcery.com>
+
PR fortran/93363
* resolve.c (resolve_assoc_var): Reject association to DT and
function name.
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index a4b1cba8501..9c928d04e0a 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -10672,7 +10672,8 @@ gfc_alloc_allocatable_for_assignment (gfc_loopinfo *loop,
/* NULLIFY an allocatable/pointer array on function entry, free it on exit.
Do likewise, recursively if necessary, with the allocatable components of
- derived types. */
+ derived types. This function is also called for assumed-rank arrays, which
+ are always dummy arguments. */
void
gfc_trans_deferred_array (gfc_symbol * sym, gfc_wrapped_block * block)
@@ -10694,7 +10695,8 @@ gfc_trans_deferred_array (gfc_symbol * sym, gfc_wrapped_block * block)
/* Make sure the frontend gets these right. */
gcc_assert (sym->attr.pointer || sym->attr.allocatable || sym_has_alloc_comp
- || has_finalizer);
+ || has_finalizer
+ || (sym->as->type == AS_ASSUMED_RANK && sym->attr.dummy));
gfc_save_backend_locus (&loc);
gfc_set_backend_locus (&sym->declared_at);