* [Patch, Fortran] PR87625 - fix reallocate on assign with polymophic arrays
@ 2018-10-17 8:35 Tobias Burnus
0 siblings, 0 replies; 2+ messages in thread
From: Tobias Burnus @ 2018-10-17 8:35 UTC (permalink / raw)
To: gcc-patches, fortran
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
for some reasons, the two calls to gfc_is_reallocatable_lhs(expr1) differ, the first
one is a simple "var" + full-array reference while the second one is
"var->_data" + full-array reference.
Neither was handled and, hence, using
var = [ t(11), t(12) ]
didn't do any memory allocation; the program then simply segfaulted on assignment.
Build and regtested on x86-64-gnu-linux.
OK for the trunk?
Tobias
[-- Attachment #2: pr87625_realloc_on_assign.diff --]
[-- Type: text/x-diff, Size: 2052 bytes --]
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index ea4cf8cd1b8..47fec131c78 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -9616,9 +9616,15 @@ gfc_is_reallocatable_lhs (gfc_expr *expr)
if (sym->ts.type == BT_CLASS
&& !sym->attr.associate_var
&& CLASS_DATA (sym)->attr.allocatable
- && expr->ref && expr->ref->type == REF_COMPONENT
- && strcmp (expr->ref->u.c.component->name, "_data") == 0
- && expr->ref->next == NULL)
+ && expr->ref
+ && ((expr->ref->type == REF_ARRAY && expr->ref->u.ar.type == AR_FULL
+ && expr->ref->next == NULL)
+ || (expr->ref->type == REF_COMPONENT
+ && strcmp (expr->ref->u.c.component->name, "_data") == 0
+ && (expr->ref->next == NULL
+ || (expr->ref->next->type == REF_ARRAY
+ && expr->ref->next->u.ar.type == AR_FULL
+ && expr->ref->next->next == NULL)))))
return true;
/* An allocatable variable. */
diff --git a/gcc/testsuite/gfortran.dg/realloc_on_assign_31.f90 b/gcc/testsuite/gfortran.dg/realloc_on_assign_31.f90
new file mode 100644
index 00000000000..55096d179ba
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/realloc_on_assign_31.f90
@@ -0,0 +1,31 @@
+! { dg-do run }
+!
+! PR fortran/87625
+!
+! Ensure that "var" gets allocated.
+!
+! Contributed by Tobias Burnus
+!
+program test
+ implicit none
+ type t
+ integer :: i
+ end type t
+ class(t), allocatable :: var(:)
+ call poly_init()
+ print *, var(:)%i
+ if (lbound(var, 1) /= 1 .and. ubound(var, 1) /= 2) call abort()
+ if (var(1)%i /= 11 .or. var(2)%i /= 12) call abort()
+ call poly_init2()
+ !print *, var(:)%i
+ if (lbound(var, 1) /= 1 .and. ubound(var, 1) /= 3) call abort()
+ if (var(1)%i /= 11 .or. var(2)%i /= 12 .or. var(3)%i /= 13) call abort()
+contains
+ subroutine poly_init()
+ !allocate(var(2))
+ var = [t :: t(11), t(12)]
+ end subroutine poly_init
+ subroutine poly_init2()
+ var = [t :: t(11), t(12), t(13)]
+ end subroutine poly_init2
+ end program test
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Patch, Fortran] PR87625 - fix reallocate on assign with polymophic arrays
@ 2018-10-18 16:28 Paul Richard Thomas
0 siblings, 0 replies; 2+ messages in thread
From: Paul Richard Thomas @ 2018-10-18 16:28 UTC (permalink / raw)
To: burnus at gcc dot gnu.org, gcc-patches, fortran
Your patch at: https://gcc.gnu.org/ml/fortran/2018-10/msg00079.html is
OK for trunk.
Thanks
Paul
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-18 16:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-17 8:35 [Patch, Fortran] PR87625 - fix reallocate on assign with polymophic arrays Tobias Burnus
2018-10-18 16:28 Paul Richard Thomas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).