From patchwork Wed Jul 26 19:17:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1813419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=hNMq8CQf; dkim-atps=neutral Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RB3b26dpYz1yY5 for ; Thu, 27 Jul 2023 05:18:22 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 98E0F38560AA for ; Wed, 26 Jul 2023 19:18:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 98E0F38560AA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1690399100; bh=r+A0GTyFKsQwYj9A608v0tn2WEnv6xJoW0zAJMS3m7s=; h=Date:Subject:To:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=hNMq8CQfCuTRPKeSL/Itr8tFguWBPEXCGxp6setnlyTravO2UPpOwEsIesiCaRyi9 0YyHxa6QKdJCzTRfr6FFkk5NF/hUkM4kbVC184v7zzsunnuDXJ0RZ+IorCQlKIzMSH MG/QiVP7Chj3pR1dnBwv5oNaMPKY7qAHpkyeksY8= 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.21]) by sourceware.org (Postfix) with ESMTPS id 9C63C3858D35; Wed, 26 Jul 2023 19:18:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9C63C3858D35 X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [192.168.178.29] ([79.251.5.69]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MGQnF-1qevRC0f6b-00GmMf; Wed, 26 Jul 2023 21:17:59 +0200 Message-ID: Date: Wed, 26 Jul 2023 21:17:58 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: [PATCH, v2] Fortran: diagnose strings of non-constant length in DATA statements [PR68569] To: fortran , gcc-patches Newsgroups: gmane.comp.gcc.patches,gmane.comp.gcc.fortran References: Content-Language: en-US In-Reply-To: X-Provags-ID: V03:K1:p8hQc3UrCN0yWgeE6avkVmfbDjMWT+s3DFDnSaftDFcVM7mNLEO zN0nUmPselV8rwzvQ4HV+/UQI1uG0NjKsUX+RirMw4Jn7JAo7t7agzyu0vpyUaq/R+qUZQ5 ntp5yWORrSm4fsvMtzbVOg7j1z+wPQJTDAhe/9VnsXmI4FONILVgCYtZw59iFOk0LbGsKJf RQZbEOSRQj/TCfoHBE0WQ== UI-OutboundReport: notjunk:1;M01:P0:219fhHjQFLw=;UYfvzwBV6MA+FjZxYLjL4eysKEG wdVi4FIvFQjJ4Zcv5fbad+S5a5tw6MloeJPwGM+YujUtKWgdctWRqC0PMHELIdkZE35f4H6PB ICzFzH/jvVUlF24E0HdSsVwE6fjY90tRVAXpDr0pxKMrcBNE84PQcag/CsPnf/CVOOpK1Yw50 k5ZaFbsyAwk9VnyXrdhFOgSXVJyFr4QK0443+7n8lyovN3+fEyj/wsJ01lP3ChugYsBWqWV4x 8M3Q7lo4Jl6FJbiWQCE1YSNEV2RpofX4ARs5FutFYgjorcpXnvsbjdTH2xeNq4rL9CG3LbOz/ U2HnIV6B5RrEIgdNtC8sRKStNjCU6dvSP1Y+bmpw1HyM/LzizXlGbijAuw5ZmRylOVICWl7LE hhq6Vbp0zOq+ziwofK2rikH/vKhu8fGOlUfXANWmdGDeos7SOF0n6d9AsXSw5qyHGJpYcHZSe OtQneYeoX6coWlkZquqEbxx5pXv9gSJMUr6WYocHSlZYTxP1tOzUk90DZXD8jQgYBCu3SDzYX 8N4/mfHhDBEUMmlTV84mKQ4sxjeLEYPZOZTxMwF3zfiSdrFdbxbUbcGbzBbEKKEM0z9zbCa63 y4CjFSvXJS9tmr6FarpieJGprz5Qi4ODlqr+lUhrUK+lAiZDBaBW6HF0hp5zVYic9XMeIoUu5 zT4QVEAXJMNqR5+/5EOrgxh37nStraz9mrBlUedsiwbqcsMS/COL6egwMSnIYCHNN8WwtXFFF xdSxSzf7YlAimFuqhywP4J+lwfe+1rCZgGQO583KjTrmfRwO2usX3l8Zw93iNTKuL0Te8Xier yKvPhLrFuMkeBbVcnXoJiqJpdtAezu+mzljuRmqJar6E15SrNzk6io1I89VhexbWTvv0xjah7 mX7U5bPd6eNfX2knixipw44vFpeVSNWcPW2ZxfAyfbc4LL/3pIxxsSs2VRCSXznBYie+Qs498 Zd3H0GnnvNl1GBI6UxY8S/Wld5Y= X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, IMAGE_ATTACHED, 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 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Dear all, the original submission missed the adjustments of the expected patterns of 2 tests. This is corrected in the new attachments. Am 26.07.23 um 21:10 schrieb Harald Anlauf via Gcc-patches: > 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 > Thanks, Harald diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index f7cfdfc133f..cd8e223edce 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -16771,7 +16787,6 @@ check_data_variable (gfc_data_variable *var, locus *where) return false; ar = NULL; - mpz_init_set_si (offset, 0); e = var->expr; if (e->expr_type == EXPR_FUNCTION && e->value.function.isym @@ -16838,8 +16853,24 @@ check_data_variable (gfc_data_variable *var, locus *where) "attribute", ref->u.c.component->name, &e->where); return false; } + + /* Reject substrings of strings of non-constant length. */ + if (ref->type == REF_SUBSTRING + && ref->u.ss.length + && ref->u.ss.length->length + && !gfc_is_constant_expr (ref->u.ss.length->length)) + goto bad_charlen; } + /* Reject deferred length character and strings of non-constant length. */ + if (e->ts.type == 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 == 0 || has_pointer) { mpz_init_set_ui (size, 1); @@ -16967,6 +16998,11 @@ check_data_variable (gfc_data_variable *var, locus *where) mpz_clear (offset); return t; + +bad_charlen: + gfc_error ("Non-constant character length at %L in DATA statement", + &e->where); + return false; }