* [Patch, fortran] PR fortran/100132 - Optimization breaks pointer association
@ 2021-04-17 23:48 José Rui Faustino de Sousa
0 siblings, 0 replies; only message in thread
From: José Rui Faustino de Sousa @ 2021-04-17 23:48 UTC (permalink / raw)
To: fortran, gcc-patches
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
Hi All!
Proposed patch to:
PR100132 - Optimization breaks pointer association.
Patch tested only on x86_64-pc-linux-gnu.
Correct pointer attributes when passing polymorphic pointers.
Thank you very much.
Best regards,
José Rui
Fortran: Fix function attributes [PR100132]
gcc/fortran/ChangeLog:
PR fortran/100132
* trans-types.c (create_fn_spec): fix function attributes when
passing polymorphic pointers.
gcc/testsuite/ChangeLog:
PR fortran/100132
* gfortran.dg/PR100132.f90: New test.
[-- Attachment #2: PR100132.patch --]
[-- Type: text/x-patch, Size: 2782 bytes --]
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index 9f21b3ee780..6cf85dc9a41 100644
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -2981,12 +2981,25 @@ create_fn_spec (gfc_symbol *sym, tree fntype)
for (f = gfc_sym_get_dummy_args (sym); f; f = f->next)
if (spec_len < sizeof (spec))
{
- if (!f->sym || f->sym->attr.pointer || f->sym->attr.target
+ bool is_class = false;
+ bool is_pointer = false;
+
+ if (f->sym)
+ {
+ symbol_attribute *attr = NULL;
+
+ is_class = f->sym->ts.type == BT_CLASS && CLASS_DATA (f->sym)
+ && f->sym->attr.class_ok;
+ attr = is_class ? &(CLASS_DATA (f->sym)->attr) : &(f->sym->attr);
+ is_pointer = is_class ? attr->class_pointer : attr->pointer;
+ }
+
+ if (f->sym == NULL || is_pointer || f->sym->attr.target
|| f->sym->attr.external || f->sym->attr.cray_pointer
|| (f->sym->ts.type == BT_DERIVED
&& (f->sym->ts.u.derived->attr.proc_pointer_comp
|| f->sym->ts.u.derived->attr.pointer_comp))
- || (f->sym->ts.type == BT_CLASS
+ || (is_class
&& (CLASS_DATA (f->sym)->ts.u.derived->attr.proc_pointer_comp
|| CLASS_DATA (f->sym)->ts.u.derived->attr.pointer_comp))
|| (f->sym->ts.type == BT_INTEGER && f->sym->ts.is_c_interop))
diff --git a/gcc/testsuite/gfortran.dg/PR100132.f90 b/gcc/testsuite/gfortran.dg/PR100132.f90
new file mode 100644
index 00000000000..aec0fef3d26
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/PR100132.f90
@@ -0,0 +1,81 @@
+! { dg-do run }
+!
+! Test the fix for PR100132
+!
+
+module main_m
+
+ implicit none
+
+ private
+
+ public :: &
+ foo_t
+
+ public :: &
+ set, &
+ get
+
+ type :: foo_t
+ !private
+ integer :: i
+ end type foo_t
+
+ type(foo_t), save, pointer :: data => null()
+
+contains
+
+ subroutine set(this)
+ class(foo_t), pointer, intent(in) :: this
+
+ if(associated(data)) stop 1
+ data => this
+ return
+ end subroutine set
+
+ subroutine get(this)
+ type(foo_t), pointer, intent(out) :: this
+
+ if(.not.associated(data)) stop 4
+ this => data
+ nullify(data)
+ return
+ end subroutine get
+
+end module main_m
+
+program main_p
+
+ use :: main_m, only: &
+ foo_t, set, get
+
+ implicit none
+
+ integer, parameter :: n = 1000
+
+ type(foo_t), pointer :: ps
+ type(foo_t), target :: s
+ integer :: i, j, yay, nay
+
+ yay = 0
+ nay = 0
+ do i = 1, n
+ s%i = i
+ call set(s)
+ call get(ps)
+ if(.not.associated(ps)) stop 13
+ j = ps%i
+ if(i/=j) stop 14
+ if(i/=s%i) stop 15
+ if(ps%i/=s%i) stop 16
+ if(associated(ps, s))then
+ yay = yay + 1
+ else
+ nay = nay + 1
+ end if
+ end do
+ if((yay/=n).or.(nay/=0)) stop 17
+ stop
+
+end program main_p
+
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-04-17 23:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-17 23:48 [Patch, fortran] PR fortran/100132 - Optimization breaks pointer association 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).