From: Harald Anlauf <anlauf@gmx.de>
To: Mikael Morin <morin-mikael@orange.fr>,
fortran <fortran@gcc.gnu.org>,
gcc-patches <gcc-patches@gcc.gnu.org>
Subject: [PATCH, v2] PR fortran/104573 - ICE in resolve_structure_cons, at fortran/resolve.cc:1299
Date: Tue, 1 Mar 2022 23:18:17 +0100 [thread overview]
Message-ID: <2b5ca3ac-d9d7-b6df-5b48-306a112c87be@gmx.de> (raw)
In-Reply-To: <ae1271f0-4bc8-f555-1e14-9e9414c0e168@orange.fr>
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
Hi Mikael,
Am 28.02.22 um 22:38 schrieb Mikael Morin:
> Le 28/02/2022 à 22:32, Mikael Morin a écrit :
>> So please use a condition on expr->ts.type instead.
>> I said «instead», but «as well» is more appropriate; both expr.ts.type
> and expr.ts.u.derived conditions are probably necessary.
>
I do hope I got you right. The attached patch fixes your variant
as well as the original testcase, and regtests fine.
Just to be sure: is this what you were thinking of?
Thanks for the very constructive review!
Harald
[-- Attachment #2: 0001-Fortran-error-recovery-after-invalid-assumed-type-de.patch --]
[-- Type: text/x-patch, Size: 2403 bytes --]
From e4816e150c31e127c3b6dc0032ae5555533a2d42 Mon Sep 17 00:00:00 2001
From: Harald Anlauf <anlauf@gmx.de>
Date: Tue, 1 Mar 2022 23:13:17 +0100
Subject: [PATCH] Fortran: error recovery after invalid assumed type
declaration
gcc/fortran/ChangeLog:
PR fortran/104573
* resolve.cc (resolve_structure_cons): Avoid NULL pointer
dereference when there is no valid component.
gcc/testsuite/ChangeLog:
PR fortran/104573
* gfortran.dg/assumed_type_14.f90: New test.
---
gcc/fortran/resolve.cc | 10 ++++++---
gcc/testsuite/gfortran.dg/assumed_type_14.f90 | 22 +++++++++++++++++++
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 gcc/testsuite/gfortran.dg/assumed_type_14.f90
diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc
index 753aa27e23f..0afa5d3346a 100644
--- a/gcc/fortran/resolve.cc
+++ b/gcc/fortran/resolve.cc
@@ -1288,15 +1288,19 @@ resolve_structure_cons (gfc_expr *expr, int init)
}
}
- cons = gfc_constructor_first (expr->value.constructor);
-
/* A constructor may have references if it is the result of substituting a
parameter variable. In this case we just pull out the component we
want. */
if (expr->ref)
comp = expr->ref->u.c.sym->components;
- else
+ else if ((expr->ts.type == BT_DERIVED || expr->ts.type == BT_CLASS
+ || expr->ts.type == BT_UNION)
+ && expr->ts.u.derived)
comp = expr->ts.u.derived->components;
+ else
+ return false;
+
+ cons = gfc_constructor_first (expr->value.constructor);
for (; comp && cons; comp = comp->next, cons = gfc_constructor_next (cons))
{
diff --git a/gcc/testsuite/gfortran.dg/assumed_type_14.f90 b/gcc/testsuite/gfortran.dg/assumed_type_14.f90
new file mode 100644
index 00000000000..112cde34b27
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/assumed_type_14.f90
@@ -0,0 +1,22 @@
+! { dg-do compile }
+! PR fortran/104573 - ICE in resolve_structure_cons
+! Contributed by G.Steinmetz
+! Contributed by M.Morin
+
+program p
+ type t
+ end type
+ type(*), parameter :: x = t() ! { dg-error "Assumed type of variable" }
+ print *, x
+end
+
+subroutine s
+ type t
+ integer :: a
+ end type
+ character(3), parameter :: x = t(2) ! { dg-error "Cannot convert" }
+ character(3), parameter :: y = x ! { dg-error "Unclassifiable statement" }
+ print *, y
+end
+
+! { dg-prune-output "Cannot convert" }
--
2.34.1
WARNING: multiple messages have this Message-ID
From: Harald Anlauf <anlauf@gmx.de>
To: fortran@gcc.gnu.org
Cc: gcc-patches@gcc.gnu.org
Subject: [PATCH, v2] PR fortran/104573 - ICE in resolve_structure_cons, at fortran/resolve.cc:1299
Date: Tue, 1 Mar 2022 23:18:17 +0100 [thread overview]
Message-ID: <2b5ca3ac-d9d7-b6df-5b48-306a112c87be@gmx.de> (raw)
Message-ID: <20220301221817.Jz3uPPN-NNZscFXPv5erF5YFJpti09EylZzGxmMljDc@z> (raw)
In-Reply-To: <ae1271f0-4bc8-f555-1e14-9e9414c0e168@orange.fr>
[-- Attachment #1: Type: text/plain, Size: 524 bytes --]
Hi Mikael,
Am 28.02.22 um 22:38 schrieb Mikael Morin:
> Le 28/02/2022 à 22:32, Mikael Morin a écrit :
>> So please use a condition on expr->ts.type instead.
>> I said «instead», but «as well» is more appropriate; both expr.ts.type
> and expr.ts.u.derived conditions are probably necessary.
>
I do hope I got you right. The attached patch fixes your variant
as well as the original testcase, and regtests fine.
Just to be sure: is this what you were thinking of?
Thanks for the very constructive review!
Harald
[-- Attachment #2: 0001-Fortran-error-recovery-after-invalid-assumed-type-de.patch --]
[-- Type: text/x-patch, Size: 2403 bytes --]
From e4816e150c31e127c3b6dc0032ae5555533a2d42 Mon Sep 17 00:00:00 2001
From: Harald Anlauf <anlauf@gmx.de>
Date: Tue, 1 Mar 2022 23:13:17 +0100
Subject: [PATCH] Fortran: error recovery after invalid assumed type
declaration
gcc/fortran/ChangeLog:
PR fortran/104573
* resolve.cc (resolve_structure_cons): Avoid NULL pointer
dereference when there is no valid component.
gcc/testsuite/ChangeLog:
PR fortran/104573
* gfortran.dg/assumed_type_14.f90: New test.
---
gcc/fortran/resolve.cc | 10 ++++++---
gcc/testsuite/gfortran.dg/assumed_type_14.f90 | 22 +++++++++++++++++++
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 gcc/testsuite/gfortran.dg/assumed_type_14.f90
diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc
index 753aa27e23f..0afa5d3346a 100644
--- a/gcc/fortran/resolve.cc
+++ b/gcc/fortran/resolve.cc
@@ -1288,15 +1288,19 @@ resolve_structure_cons (gfc_expr *expr, int init)
}
}
- cons = gfc_constructor_first (expr->value.constructor);
-
/* A constructor may have references if it is the result of substituting a
parameter variable. In this case we just pull out the component we
want. */
if (expr->ref)
comp = expr->ref->u.c.sym->components;
- else
+ else if ((expr->ts.type == BT_DERIVED || expr->ts.type == BT_CLASS
+ || expr->ts.type == BT_UNION)
+ && expr->ts.u.derived)
comp = expr->ts.u.derived->components;
+ else
+ return false;
+
+ cons = gfc_constructor_first (expr->value.constructor);
for (; comp && cons; comp = comp->next, cons = gfc_constructor_next (cons))
{
diff --git a/gcc/testsuite/gfortran.dg/assumed_type_14.f90 b/gcc/testsuite/gfortran.dg/assumed_type_14.f90
new file mode 100644
index 00000000000..112cde34b27
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/assumed_type_14.f90
@@ -0,0 +1,22 @@
+! { dg-do compile }
+! PR fortran/104573 - ICE in resolve_structure_cons
+! Contributed by G.Steinmetz
+! Contributed by M.Morin
+
+program p
+ type t
+ end type
+ type(*), parameter :: x = t() ! { dg-error "Assumed type of variable" }
+ print *, x
+end
+
+subroutine s
+ type t
+ integer :: a
+ end type
+ character(3), parameter :: x = t(2) ! { dg-error "Cannot convert" }
+ character(3), parameter :: y = x ! { dg-error "Unclassifiable statement" }
+ print *, y
+end
+
+! { dg-prune-output "Cannot convert" }
--
2.34.1
next prev parent reply other threads:[~2022-03-01 22:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-16 21:20 [PATCH] " Harald Anlauf
2022-02-23 22:35 ` *Ping* " Harald Anlauf
2022-02-28 21:32 ` Mikael Morin
2022-02-28 21:38 ` Mikael Morin
2022-03-01 22:18 ` Harald Anlauf [this message]
2022-03-01 22:18 ` [PATCH, v2] " Harald Anlauf
2022-03-02 11:37 ` Mikael Morin
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=2b5ca3ac-d9d7-b6df-5b48-306a112c87be@gmx.de \
--to=anlauf@gmx.de \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=morin-mikael@orange.fr \
/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).