From patchwork Wed Feb 16 21:20:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 51169 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C55EA3858431 for ; Wed, 16 Feb 2022 21:20:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C55EA3858431 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1645046433; bh=aFzS15Y14HhQnqUxHzrj51iXrgm6k5rgvRXWfJmUzTo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=rsYWO1eeGbaFxOESyBPPt6d3kToM70PMzVHtuwlX6Z7trZ/Qb3aw9OTFkzoY1prk0 tMkzJkfYaq8X7gY/ZtgFXMvi9pHP5crN0t0s1cvDfsZWcBVGcHkNUrIF0Pan807OBP hr+58t53hrdZYi1Z6GUXChLfthGkDbsI2Nwg+IQ8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by sourceware.org (Postfix) with ESMTPS id 8FE95385840E; Wed, 16 Feb 2022 21:20:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8FE95385840E X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.5.27] ([79.251.5.27]) by web-mail.gmx.net (3c-app-gmx-bap59.server.lan [172.19.172.129]) (via HTTP); Wed, 16 Feb 2022 22:20:02 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] PR fortran/104573 - ICE in resolve_structure_cons, at fortran/resolve.cc:1299 Date: Wed, 16 Feb 2022 22:20:02 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:o65X4tuK4c7LgXIz5JLcz01QsE2VqBL+Fu/Tia5E+H2hYmTebthQLME7FvNATl9mX3qwZ g6OCbJM71LweIKHQZhujS1KUZTACRiIqJovUxVvGkddOnpZa1uvUOkUWvwsD3lixbx0HtEH4t5CA qpJIwXgkOC1UudXLHy+pPvCSd4RKYcquioziQgzZ5+LUQ8GVxoul1MgN2qLMKpswLGXzfFpi07cN /J/otcDL0pY2osbk1452MeoIIfRaJm+/AUu0jON8ygZWqls4hI1JtlZq20l1FXHuHVo8p8slRSnU tY= X-UI-Out-Filterresults: notjunk:1;V03:K0:orbgpVJp5Yk=:+gq/DsgQxEheJsU/0m69+2 ya8IjtmW2hUUTYylvbts+KuSnkDHNKT4TpUHmLkSbAjuHUq8AFJdjH4bMCCcviX3tW4SKUC5I u2AP57PP3PeHTC2eUbfcZ9EijKeSFNy0ErlrZhqboj4R/Dmb/1NDsrmGA0Upd0zrsMJ0aB1n2 xovw0mT6cV1JrGCzIXk4eABO6idyfj3870fYtvrVrjpxl/TwiCAAdHJHI+IeWY7ygoyQ0M8xr 3U51MjOhxn8F04gK9WVIE+xjCcng5bV2E0hWK/inMwpBV55r7BuE51r7DIcU2/Ra62U4pv3no p11bTyBzAplrB+qgmSt30WQMgvbVG7tr279Mye+j+vfTGSyLzyl1pVJBLT2RGtcaNXHkH+bjP 2silth0uU0Crqabkf8coJDTYqgCccXVJy/25lBI5lFQov1gBIi0hoOrZlPbOaK4ScaFdE2LZY z/HBibXLVMuHaB5T7m3MDdpP2Ne1CA0gnrneMmKRHrHMVqjYymWfsTXcw2UEsBloYBeMB9c4m A/V1V9qLzdZ07f7T8OQovHazmtcxXmREqsKTCP0qqC7zk6Pcf0u3SO0oIYrLckX+hsicV6ryn d64kNwBvGuagd9dYMv2Py+uMvj6ANSy2ebMMpFh9VZAAE8uKVfRLPmC/ZXtIAHLF6bMQYkriL kWz4HsXnuvEnAO+A9ecl8lfIrzJvmTf3RQ1NsLEPU0AP3U/23UlZUb1cPduj0ppFVgMN9l32U zIF//ZDxBkCLuP6iX4vDxhrdhlZZe7UaGYRbUkopM+SaICgQll/nzwMv0qo= X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, WEIRD_PORT autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Dear Fortranners, while we detect invalid uses of type(*), we may run into other issues later when the declared variable is used, leading to an ICE due to a NULL pointer dereference. This is demonstrated by Gerhard's testcase. Steve and I came to rather similar fixes, see PR. Mine is attached. Regtested on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald From 01d629506edca711f02912e2cc124f8894cfa389 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Wed, 16 Feb 2022 22:13:02 +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 | 8 +++++--- gcc/testsuite/gfortran.dg/assumed_type_14.f90 | 12 ++++++++++++ 2 files changed, 17 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 266e41e25b1..2fa1acdbd6d 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -1288,15 +1288,17 @@ 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.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..6cfe2e4fb73 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/assumed_type_14.f90 @@ -0,0 +1,12 @@ +! { dg-do compile } +! PR fortran/104573 - ICE in resolve_structure_cons +! Contributed by G.Steinmetz + +program p + type t + end type + type(*), parameter :: x = t() ! { dg-error "Assumed type of variable" } + print *, x +end + +! { dg-prune-output "Cannot convert" } -- 2.34.1