* [Patch, fortran] PR fortran/100245 - ICE on automatic reallocation
@ 2021-04-24 11:14 José Rui Faustino de Sousa
0 siblings, 0 replies; only message in thread
From: José Rui Faustino de Sousa @ 2021-04-24 11:14 UTC (permalink / raw)
To: fortran, gcc-patches
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
Hi All!
Proposed patch to:
PR100245 - ICE on automatic reallocation.
Patch tested only on x86_64-pc-linux-gnu.
Add an if clause for handling derived types in the left hand side.
Thank you very much.
Best regards,
José Rui
Fortran: Fix ICE with automatic reallocation [PR100136]
gcc/fortran/ChangeLog:
PR fortran/100245
* trans-expr.c (trans_class_assignment): Add if clause to handle
derived type in the LHS.
gcc/testsuite/ChangeLog:
PR fortran/100245
* gfortran.dg/PR100245.f90: New test.
[-- Attachment #2: PR100245.patch --]
[-- Type: text/x-patch, Size: 1331 bytes --]
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 213f32b0a67..faced471918 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -10995,6 +10995,9 @@ trans_class_assignment (stmtblock_t *block, gfc_expr *lhs, gfc_expr *rhs,
class_han = GFC_CLASS_TYPE_P (TREE_TYPE (lse->expr))
? gfc_class_data_get (lse->expr) : lse->expr;
+ if (!POINTER_TYPE_P (TREE_TYPE (class_han)))
+ class_han = gfc_build_addr_expr (NULL_TREE, class_han);
+
/* Allocate block. */
gfc_init_block (&alloc);
gfc_allocate_using_malloc (&alloc, class_han, size, NULL_TREE);
diff --git a/gcc/testsuite/gfortran.dg/PR100245.f90 b/gcc/testsuite/gfortran.dg/PR100245.f90
new file mode 100644
index 00000000000..1fc372a0d67
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/PR100245.f90
@@ -0,0 +1,29 @@
+! { dg-do run }
+!
+! Test the fix for PR100245
+!
+
+program main_p
+
+ implicit none
+
+ type :: foo_t
+ integer :: a
+ end type foo_t
+
+ integer, parameter :: a = 42
+
+ class(foo_t), allocatable :: val
+ class(foo_t), allocatable :: rs1
+ type(foo_t), allocatable :: rs2
+
+ allocate(val, source=foo_t(42))
+ if (val%a/=a) stop 1
+ rs1 = val
+ if (rs1%a/=a) stop 2
+ rs2 = val
+ if (rs2%a/=a) stop 3
+ deallocate(val, rs1, rs2)
+ stop
+
+end program main_p
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-04-24 11:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-24 11:14 [Patch, fortran] PR fortran/100245 - ICE on automatic reallocation José Rui Faustino de Sousa
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).