Hi Mikael,
Am 09.01.22 um 20:28 schrieb Mikael Morin:
Le 03/01/2022 à 20:45, Harald Anlauf via Fortran a écrit :
Dear all,
the initial-data-target for a pointer initialization can be either
NULL() or a non-constant target. In the latter case subscripts of
the target specification (or substring starting and ending points)
must be constant expressions. The patch adds corresponding checks.
I have verified that current Intel and Cray compilers generate similar
errors for the testcase.
Regtested on x86_64-pc-linux-gnu. OK for mainline?
Hello,
There is gfc_check_pointer_assign which does already various checks
relating to pointer assignment, and those with is_init_expr == true
could be tightened a bit.
agreed, this is a more appropriate location for this kind of checks.
OK with your additional checks moved there.
Thanks.
Done so and pushed as r12-6387, see attached updated patch.
Thanks for the review!
From 2e63128306ff93d8f53119137dd6c28b2defac94 Mon Sep 17 00:00:00 2001
From: Harald Anlauf <anl...@gmx.de>
Date: Sun, 9 Jan 2022 22:08:14 +0100
Subject: [PATCH] Fortran: reject invalid non-constant pointer initialization
targets
gcc/fortran/ChangeLog:
PR fortran/101762
* expr.c (gfc_check_pointer_assign): For pointer initialization
targets, check that subscripts and substring indices in
specifications are constant expressions.
gcc/testsuite/ChangeLog:
PR fortran/101762
* gfortran.dg/pr101762.f90: New test.
---
gcc/fortran/expr.c | 34 ++++++++++++++++++++++++++
gcc/testsuite/gfortran.dg/pr101762.f90 | 23 +++++++++++++++++
2 files changed, 57 insertions(+)
create mode 100644 gcc/testsuite/gfortran.dg/pr101762.f90
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 96a2cd70900..a87686d8217 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -4343,6 +4343,7 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue,
{
gfc_symbol *sym;
bool target;
+ gfc_ref *ref;
if (gfc_is_size_zero_array (rvalue))
{
@@ -4372,6 +4373,39 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue,
&rvalue->where);
return false;
}
+
+ for (ref = rvalue->ref; ref; ref = ref->next)
+ {
+ switch (ref->type)
+ {
+ case REF_ARRAY:
+ for (int n = 0; n < ref->u.ar.dimen; n++)
+ if (!gfc_is_constant_expr (ref->u.ar.start[n])
+ || !gfc_is_constant_expr (ref->u.ar.end[n])
+ || !gfc_is_constant_expr (ref->u.ar.stride[n]))
+ {
+ gfc_error ("Every subscript of target specification "
+ "at %L must be a constant expression",
+ &ref->u.ar.where);
+ return false;
+ }
+ break;
+
+ case REF_SUBSTRING:
+ if (!gfc_is_constant_expr (ref->u.ss.start)
+ || !gfc_is_constant_expr (ref->u.ss.end))
+ {
+ gfc_error ("Substring starting and ending points of target "
+ "specification at %L must be constant expressions",
+ &ref->u.ss.start->where);
+ return false;
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
}
else
{
diff --git a/gcc/testsuite/gfortran.dg/pr101762.f90 b/gcc/testsuite/gfortran.dg/pr101762.f90
new file mode 100644
index 00000000000..9ffd7540d81
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr101762.f90
@@ -0,0 +1,23 @@
+! { dg-do compile }
+! PR fortran/101762 - ICE on non-constant pointer initialization targets
+! Contributed by G.Steinmetz
+
+program p
+ integer, target :: a(3) = [7, 8, 9]
+ integer, pointer :: x => a(3)
+ integer, pointer :: y => a(n()) ! { dg-error "constant expression" }
+ integer, pointer :: z(:) => a(:n()) ! { dg-error "constant expression" }
+ character(7), target :: c = "abcdefg"
+ character(3), pointer :: c0 => c(2:4)
+ character(3), pointer :: c1 => c(m():) ! { dg-error "constant expression" }
+ character(3), pointer :: c2 => c(:m()) ! { dg-error "constant expression" }
+ print *, x, y
+contains
+ pure integer function k ()
+ k = 2
+ end function k
+ subroutine s ()
+ integer, pointer :: yy => a(k()) ! { dg-error "constant expression" }
+ print *, yy
+ end subroutine s
+end
--
2.31.1
