From patchwork Tue Jul 13 19:47:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1504804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: 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=W0r+Rjt5; dkim-atps=neutral Received: from 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GPWRM4Ylvz9sRN for ; Wed, 14 Jul 2021 05:49:02 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E8AC03971C29 for ; Tue, 13 Jul 2021 19:48:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E8AC03971C29 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1626205739; bh=9wvrg/uzhx5SMl224CEpq1FRVT1EJYpNfwYLEUGGYKc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=W0r+Rjt5yree1mMu3EH/ksAM0o36ouoWA7EVVn/5hYP8Lkg60ZOCey86uu2HzdwRv SvV0h+9f/NfKXkh2RnejeYQh1yseL4FN94Axel0kfxSfgnEyGE2r3r9wE/MN7Np/4F 6/edgTiXHBSTRIO0kjW/KlBumNGuU5kdZwJLV78o= 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.22]) by sourceware.org (Postfix) with ESMTPS id A6BD9393AC12; Tue, 13 Jul 2021 19:47:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A6BD9393AC12 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.5.89] ([79.251.5.89]) by web-mail.gmx.net (3c-app-gmx-bap01.server.lan [172.19.172.71]) (via HTTP); Tue, 13 Jul 2021 21:47:57 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] PR fortran/100949 - [9/10/11/12 Regression] ICE in gfc_conv_expr_present, at fortran/trans-expr.c:1975 Date: Tue, 13 Jul 2021 21:47:57 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:8bWbo650SW2MOaveEzZG8PKlc6gancXJV4u33Yt/Y8vhIdzWIvVWf/D0+BtxA9hMxvy4u tdSGoeDfetS7zB+3IDyxLryxNWytKjj0MoUM7/ANGy3Johc63Lky6zJB9ZBEWna3tfdbsCCTEK2M Ofkokr893EhkUC1aVD/QBPo3Ih3YzeRJXVw2VRCFg5TlQQ1/Rc3AsAl/zLsmWjxco0Dn71A+VE5R Gq/ZrD+OHCNKgEObp/WdfNkUfkHnfkjXPGkJlg8AQFJJZFJoY42i3WouypXO9dy7ofhF6pkfEfG6 RE= X-UI-Out-Filterresults: notjunk:1;V03:K0:L5zIFpf2BrM=:FLD+1NZi1bqDjL84Q6Lbo/ 0UlWJPiXevUlfIKigqqYD7iq6HXx0O2KGHY2KPnsP/KsEfuXt11fFtgsoN7IGHEx0iGq775TV 8+kcZw5mL2ucISrEli4Wlb6m3/1WAdng4N+O/HG7/GX3tFaFLoZez+hHWvHbONO4WtuOxAnCB a/WN1d3olgkFniAmeRx7a1PqdOoihB0L/CXk5POIz/XvicG8WgNcRJlBRHYPgLLOk943cM+AM AaY+SyihEJIQo38hie9+NUW0l/FQAcZ1bEKsGeIKlvJSNccgMQXnA7KOseo3+Y46sInTFnokW 9hLdn+J7mUoUuezHHw89XtJo7UQf+zhIZtyCZL2nifq4w5yEgW1Fme8MszVIwU4XsC58AmWM2 9mNzBNapM4DaQbci0rKY6DkNWAAxkzDvOl9xzbbdARpoD0uYGTJcRVA0ZhaskpBsb7Kxlc+j5 ot4dZA9DYcVX71DYrulrZh2OBVobUw+FgCoR2z7FEF5glq9pIw85jiIkrq6S72BNfLQhBqKVq KpzOQTdA3RmtqshknK05HOe+KszlzlmSt8UAlOdUla7JxaXql+YnwPUyVDNaEAa1A9gbKFBbw 9vzoBxnff0K3ipqhQa4cEIJgeF2buvFW+NG32uXO1/N+aVkvm5AJSSmpU8KNYrdef1vBCVvbE Em11utHVJf+bV0RZ4Vc1zTHSF56lFIKQc05JVyeDeOQXl9Fj4ORp/u90/tiSjI/JavRizHnAb 0QbyaP+pQDHL3a0g1y5GkIAAnBJypmtqTPVJ4oFTX6WSwhv7D5JET33MWLGkx2HQ7k+oCSlrj n0yqmgXw/BwNL28X1qXrMLoHCEm1A== X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hello world, we rather shouldn't consider a presence check for a non-dummy variable. Regtested on x86_64-pc-linux-gnu. OK for all affected branches? Thanks, Harald Fortran - ICE in gfc_conv_expr_present while initializing a non-dummy class variable gcc/fortran/ChangeLog: PR fortran/100949 * trans-expr.c (gfc_trans_class_init_assign): Call gfc_conv_expr_present only for dummy variables. gcc/testsuite/ChangeLog: PR fortran/100949 * gfortran.dg/pr100949.f90: New test. diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index de406ad2e8f..9e0dcdefd25 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -1741,8 +1741,9 @@ gfc_trans_class_init_assign (gfc_code *code) } } - if (code->expr1->symtree->n.sym->attr.optional - || code->expr1->symtree->n.sym->ns->proc_name->attr.entry_master) + if (code->expr1->symtree->n.sym->attr.dummy + && (code->expr1->symtree->n.sym->attr.optional + || code->expr1->symtree->n.sym->ns->proc_name->attr.entry_master)) { tree present = gfc_conv_expr_present (code->expr1->symtree->n.sym); tmp = build3_loc (input_location, COND_EXPR, TREE_TYPE (tmp), diff --git a/gcc/testsuite/gfortran.dg/pr100949.f90 b/gcc/testsuite/gfortran.dg/pr100949.f90 new file mode 100644 index 00000000000..6c736fd7f72 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr100949.f90 @@ -0,0 +1,10 @@ +! { dg-do compile } +! PR fortran/100949 - ICE in gfc_conv_expr_present, at fortran/trans-expr.c:1975 + +subroutine s +entry f + type t + end type + class(t), allocatable :: y, z + allocate (z, mold=y) +end