From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by sourceware.org (Postfix) with ESMTPS id ACD3A3858D35; Wed, 26 Jul 2023 19:10:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ACD3A3858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1690398620; x=1691003420; i=anlauf@gmx.de; bh=fSVHGHQiCdiy/0pHdb0WNEekVLsymUMEcfv8URcTDXQ=; h=X-UI-Sender-Class:From:To:Subject:Date; b=DjXSVN3S1eru4yREAY7RuLJx8incbhnGLBRlatdmFBB0+Wh+wkflpFnI0pfvKFqHatq3/hC MQX0TxLh5z7j/rff5MW/2kta2wctUvSVOEriJZMZknb8Hkq3htnQKYAMa1o5xtlE190Rp3yu5 L52eZHYO2BujP5oy1N3ncNEEJcjhuvUdld6fSxj+axJoc+BGy79RxSyB6H5W/tz3hv8HnDD4G uTNlzuHQrNkLwFFTVLJk7fA3IxJGXFku7AZJwpSg+QCYDblwscrv2+iPSMEY7JvYOwRxLTKL+ rGGC9XRJOatHE1nbcvOxXkf/AYuZW/ZxC9lJF+M4gzTO2sLIer1g== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [79.251.5.69] ([79.251.5.69]) by web-mail.gmx.net (3c-app-gmx-bap18.server.lan [172.19.172.88]) (via HTTP); Wed, 26 Jul 2023 21:10:20 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH] Fortran: diagnose strings of non-constant length in DATA statements [PR68569] Content-Type: multipart/mixed; boundary=refeik-ea96b3c0-97f4-4066-ba83-e6c5cba4d764 Date: Wed, 26 Jul 2023 21:10:20 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:TD6qV6GMh4h1auBNVMyYMfFI8dChaMHUBZl5b76HqBtHh70JDdA95lszHyzRKZY3OZ5hm YHdctQfkr5j/vs41VqNc7yAuUcEQc+VxWagI8eW9aD/rcvFzP/VwKg235ZTvpOdIkm/jG8Y2obgY dGjBNOaAxDdEpfj8YHcl9R8i74GnoxkzeqXesJdxolCuSVSufgV8h9dHK6vKmVpyBRG1RRXzFEh2 Ldp+5Hf9xIBvwqcR1S/DNUN7lTNyWnNAhA5nyMB3zx6h76++tEEnCoT/2a2Nfq2qB8WI6CTZdf4J 7g= UI-OutboundReport: notjunk:1;M01:P0:uXrLQXuAO4E=;gnZJQKpUIL94BT6DSKHwOIYFP4Q ZKzeit5GSCL9840pOkMsDylS/uUek3JH/3DJ0bgSO6Q6a6aYQ5rpYvXvGwuDAL9TbDtiGWM7V b28NG2tG+qvm9rGdIYc2+Nefo6GAzbXwWvkxvuBd6Bb3awfhEa5g2B/Peau/keCw1docW4LEw UXNHZmKFyoiWWIeZHCF4X0pFFi3Xb1Hq4y1fDTfpphsvQymWwBWrvs57iMnKDe2EUarwDTzsL p+o2pbfbrAizLctYVwLtQ1CfkDEpkqTMdR0koMqabyS1+wA8ckUBpwjIN2P7Okj8+1GEksoKB vFMmkppotiL0M50crWL7Q4Xs6MaMh6uijPODoEzNUhDCy5IQcBHEkHpsnfW7GEaEiIJlCorgy 8KvjXYAZwotVgxxNfzqbE1WPYuDhHgwuSu/gCvEZY02Hj+PLdnIhR4tnF8x0ftr/OoQ/x3sJY yC16pxJONvEMwUTECWbEB1n1AwNXPZDPpg5jLPNQuMIL/O77ZOsnj5D7ZkuEqUvnTTmKRRfbr zAyE8ZzqA2kntTUraPdvhPmRzhez7hshA/fcsRlhJ/rL47FVEizWiLwy2zILfEXdHwSoa/T77 okYCSsVkYCgPF6AaKNuWG8gGrCis97uGIB26M3zTp7dNQeZCynYiBVmp324cf9m7aL17WTsmn 0GDuCMHGO+SpC4/2ZdrX96p7YA4e56lcBILtrYSaI2DN9Ea79N74V0kHj7uAgDtzOk9hdHlr2 KOlD0IemmVwEWRjjTOI87njt6HkbxrPPBnf4JYRnmDv5Vtl3PXzYQcU645SesM0GF5h+cKwfp uYE/KxcQkd5uIxv7GlNYcnwg== X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --refeik-ea96b3c0-97f4-4066-ba83-e6c5cba4d764 Content-Type: text/plain; charset=UTF-8 Dear all, the attached patch fixes an ICE-on-invalid after use of strings of non-constant length in DATA statements. Regtested on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald --refeik-ea96b3c0-97f4-4066-ba83-e6c5cba4d764 Content-Type: text/x-patch Content-Disposition: attachment; filename=pr68569.diff Content-Transfer-Encoding: quoted-printable =46rom b5b13db48c169ef18a8b75739bd4f22f9fd5654e Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Wed, 26 Jul 2023 20:46:50 +0200 Subject: [PATCH] Fortran: diagnose strings of non-constant length in DATA statements [PR68569] gcc/fortran/ChangeLog: PR fortran/68569 * resolve.cc (check_data_variable): Do not accept strings with deferred length or non-constant length in a DATA statement. Reject also substrings of string variables of non-constant length. gcc/testsuite/ChangeLog: PR fortran/68569 * gfortran.dg/data_char_6.f90: New test. =2D-- gcc/fortran/resolve.cc | 22 ++++++++++++++++++- gcc/testsuite/gfortran.dg/data_char_6.f90 | 26 +++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/data_char_6.f90 diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index f7cfdfc133f..3cd470ddcca 100644 =2D-- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -16771,7 +16771,6 @@ check_data_variable (gfc_data_variable *var, locus= *where) return false; ar =3D NULL; - mpz_init_set_si (offset, 0); e =3D var->expr; if (e->expr_type =3D=3D EXPR_FUNCTION && e->value.function.isym @@ -16838,8 +16837,24 @@ check_data_variable (gfc_data_variable *var, locu= s *where) "attribute", ref->u.c.component->name, &e->where); return false; } + + /* Reject substrings of strings of non-constant length. */ + if (ref->type =3D=3D REF_SUBSTRING + && ref->u.ss.length + && ref->u.ss.length->length + && !gfc_is_constant_expr (ref->u.ss.length->length)) + goto bad_charlen; } + /* Reject strings with deferred length or non-constant length. */ + if (e->ts.type =3D=3D BT_CHARACTER + && (e->ts.deferred + || (e->ts.u.cl->length + && !gfc_is_constant_expr (e->ts.u.cl->length)))) + goto bad_charlen; + + mpz_init_set_si (offset, 0); + if (e->rank =3D=3D 0 || has_pointer) { mpz_init_set_ui (size, 1); @@ -16967,6 +16982,11 @@ check_data_variable (gfc_data_variable *var, locu= s *where) mpz_clear (offset); return t; + +bad_charlen: + gfc_error ("Non-constant character length at %L in DATA statement", + &e->where); + return false; } diff --git a/gcc/testsuite/gfortran.dg/data_char_6.f90 b/gcc/testsuite/gfo= rtran.dg/data_char_6.f90 new file mode 100644 index 00000000000..4e32c647d4d =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/data_char_6.f90 @@ -0,0 +1,26 @@ +! { dg-do compile } +! PR fortran/68569 - ICE with automatic character object and DATA +! Contributed by G. Steinmetz + +subroutine s1 (n) + implicit none + integer, intent(in) :: n + character(n) :: x + data x /'a'/ ! { dg-error "Non-constant character length" } +end + +subroutine s2 (n) + implicit none + integer, intent(in) :: n + character(n) :: x + data x(1:1) /'a'/ ! { dg-error "Non-constant character length" } +end + +subroutine s3 () + implicit none + type t + character(:) :: c ! { dg-error "must be a POINTER or ALLOCATABLE" } + end type t + type(t) :: tp + data tp%c /'a'/ ! { dg-error "Non-constant character length" } +end =2D- 2.35.3 --refeik-ea96b3c0-97f4-4066-ba83-e6c5cba4d764--