From: Tobias Burnus <tobias.burnus@physik.fu-berlin.de>
To: gcc-patches@gcc.gnu.org, fortran@gcc.gnu.org
Subject: [Patch, Fortran] PR71194 - Fix ICE with pointer assignment
Date: Mon, 20 Jun 2016 12:10:00 -0000 [thread overview]
Message-ID: <20160620121037.GA31517@physik.fu-berlin.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 708 bytes --]
Dear all,
the issue occurs only if the RHS of a pointer assignment is a function and
the ICE is only triggered when a rank remapping is needed.
gfc_conv_expr_descriptor calls for a expr2 gfc_conv_procedure_call, which
sets "se.expr" to NULL_TREE - and the code later tries to access it.
The code correctly sets rse.expr to "tmp", but that does not help as all
actions were wrongly done on lse before. Solution: Stuff the RHS expr2 into
rse not into lse.
Build and regtested* on x86-64-gnu-linux.
OK for the trunk?
Tobias
(* gfortran.dg/graphite/pr68279.f90 fails but is a known PR,
gfortran.dg/vect/vect-8.f90 fails but not only for me, and
gfortran.dg/guality/pr41558.f90 never worked on that system)
[-- Attachment #2: pointer_remap.diff --]
[-- Type: text/x-diff, Size: 2286 bytes --]
PR fortran/71194
* trans-expr.c (gfc_trans_pointer_assignment): Correctly handle
RHS pointer functions.
PR fortran/71194
* gfortran.dg/pointer_remapping_10.f90 | 46 ++++++++++++++++++++++
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 8f84712..b5731aa 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -7934,11 +7934,11 @@ gfc_trans_pointer_assignment (gfc_expr * expr1, gfc_expr * expr2)
bound, bound, 0,
GFC_ARRAY_POINTER_CONT, false);
tmp = gfc_create_var (tmp, "ptrtemp");
- lse.descriptor_only = 0;
- lse.expr = tmp;
- lse.direct_byref = 1;
- gfc_conv_expr_descriptor (&lse, expr2);
- strlen_rhs = lse.string_length;
+ rse.descriptor_only = 0;
+ rse.expr = tmp;
+ rse.direct_byref = 1;
+ gfc_conv_expr_descriptor (&rse, expr2);
+ strlen_rhs = rse.string_length;
rse.expr = tmp;
}
else
diff --git a/gcc/testsuite/gfortran.dg/pointer_remapping_10.f90 b/gcc/testsuite/gfortran.dg/pointer_remapping_10.f90
new file mode 100644
index 0000000..4810506
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pointer_remapping_10.f90
@@ -0,0 +1,46 @@
+! { dg-do run }
+! { dg-options "-fcheck=all" }
+!
+! PR fortran/71194
+!
+! Contributed by T Kondic
+!
+program ice
+implicit none
+integer, parameter :: pa=10, pb=20
+complex, target :: a(pa*pb)
+real, pointer:: ptr(:,:) =>null()
+integer :: i, j, cnt
+logical :: negative
+
+ do i = 1, size(a)
+ a(i) = cmplx(i,-i)
+ end do
+
+ ! Was ICEing before with bounds checks
+ ptr(1:pa*2,1:pb) => conv2real(a)
+
+ negative = .false.
+ cnt = 1
+ do i = 1, ubound(ptr,dim=2)
+ do j = 1, ubound(ptr,dim=1)
+ if (negative) then
+ if (-cnt /= ptr(j, i)) call abort()
+ cnt = cnt + 1
+ negative = .false.
+ else
+ if (cnt /= ptr(j, i)) call abort()
+ negative = .true.
+ end if
+ end do
+ end do
+
+contains
+ function conv2real(carr)
+ use, intrinsic :: iso_c_binding
+ ! returns real pointer to a complex array
+ complex, contiguous, intent(inout), target :: carr(:)
+ real,contiguous,pointer :: conv2real(:)
+ call c_f_pointer(c_loc(carr),conv2real,[size(carr)*2])
+ end function conv2real
+end program
next reply other threads:[~2016-06-20 12:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 12:10 Tobias Burnus [this message]
2016-06-20 16:10 ` Paul Richard Thomas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160620121037.GA31517@physik.fu-berlin.de \
--to=tobias.burnus@physik.fu-berlin.de \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).