From patchwork Tue May 9 16:00:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Richard Thomas X-Patchwork-Id: 68984 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 3CD16385355A for ; Tue, 9 May 2023 16:02:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3CD16385355A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1683648125; bh=GwxaByfAUHKve20jBYYpajdp6qhw7fhjIjMs1XgfqI0=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=FRDGOxRlqQxKFzv1SXWUPpmbILSEfB1SEjy3Pmu2iseAjrxMdh7enjmgk0dFUVlDE 9sEgdq4ala+bW2zspFq8HMIcCuM6a/kM3Hfcuxa3d3cTJ9zw+5vHToSrgnefatFxJb m6AUngwwFY1S6LkqFtp419YY59GUuqhC9SR7BlRw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by sourceware.org (Postfix) with ESMTPS id DD7473857359; Tue, 9 May 2023 16:00:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DD7473857359 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-24deb9c5ffcso4192357a91.1; Tue, 09 May 2023 09:00:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683648057; x=1686240057; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=9OR/tGlY6zwZc1sW6VekLqIyD0LEQPUrsRHZt7iH2iw=; b=MsLAEcqqLPhElHNnFVZlNXu7YaUL6wzl4iQ16rnWykggcQkaALrCOKyDcwVarpj0oG AHPKBjllVLfXFMmWj/8LxRod3z04cPrxQwNOSSc4ISI1IkSgOnOTgIOp8fSCgWrxF98S Y7sH9tp6m8kwi17cWx2QfUPmA5KtTPGByrYjEr8pOWrF8NQ1dGL7cLV/kn73A4NrG9H5 Jkxi5cYSLPCPPk6jwRUnrpxU3k06ml21EErp/noo+ngDESgVWoEoHBfdqydKHeRr+Chz BD8KQ9RyEjgzci7WAlxtEUPkFlWzhIJ8Dv6YbfDfwTyNhC+h23C/PC6Z+4XWo50Tdb63 xLNg== X-Gm-Message-State: AC+VfDztK5/+DiXuzcxrwkNpUxHvdX1Jnd9+XtJi01Zuz3HJcFYpMBQa h1aW7+DYPWu8CDeJnKVR6NkezjZAkOtEEMRNFiw+mFH+iqRk1A== X-Google-Smtp-Source: ACHHUZ6dP5xH0OHNmEHiFOO5/mQ4u8w4jQ9shWVzcAMW7GAZxEhGriRo9KE7po91EGwnFVQcZydTLZ6AMvyES2Uzn3I= X-Received: by 2002:a17:90b:3a8d:b0:23f:9fac:6b35 with SMTP id om13-20020a17090b3a8d00b0023f9fac6b35mr14142728pjb.39.1683648057339; Tue, 09 May 2023 09:00:57 -0700 (PDT) MIME-Version: 1.0 Date: Tue, 9 May 2023 17:00:46 +0100 Message-ID: Subject: [Patch, fortran] PR103716 - [10/11/12/13/14 Regression] ICE in gimplify_expr, at gimplify.c:15964 To: "fortran@gcc.gnu.org" , gcc-patches X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, HTML_MESSAGE, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, 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-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: Paul Richard Thomas via Gcc-patches From: Paul Richard Thomas Reply-To: Paul Richard Thomas Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi All, This problem caused the gimplifier failure because the reference chain ending in an inquiry_len still retained a full array reference. This had already been corrected for deferred character lengths but the fix extends this to all characters without a length expression and integer expressions, which is the correct type of course, that retain a full array_spec. The nullification of the se->string length in conv_inquiry is a belts-and-braces measure to stop it from winding up as a hidden argument in procedure calls. OK for trunk and, after a decent delay, backporting? Cheers Paul Fortran: Fix assumed length chars and len inquiry [PR103716] 2023-05-09 Paul Thomas gcc/fortran PR fortran/103716 * resolve.cc (gfc_resolve_ref): Conversion of array_ref into an element should be done for all characters without a len expr, not just deferred lens, and for integer expressions. * trans-expr.cc (conv_inquiry): For len and kind inquiry refs, set the se string_length to NULL_TREE. gcc/testsuite/ PR fortran/103716 * gfortran.dg/pr103716 : New test. diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index 55d8e326a87..8f0dd8b6dee 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -5504,7 +5504,9 @@ gfc_resolve_ref (gfc_expr *expr) case REF_INQUIRY: /* Implement requirement in note 9.7 of F2018 that the result of the LEN inquiry be a scalar. */ - if (ref->u.i == INQUIRY_LEN && array_ref && expr->ts.deferred) + if (ref->u.i == INQUIRY_LEN && array_ref + && ((expr->ts.type == BT_CHARACTER && !expr->ts.u.cl->length) + || expr->ts.type == BT_INTEGER)) { array_ref->u.ar.type = AR_ELEMENT; expr->rank = 0; diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc index 09cdd9263c4..3225b419989 100644 --- a/gcc/fortran/trans-expr.cc +++ b/gcc/fortran/trans-expr.cc @@ -2861,11 +2861,13 @@ conv_inquiry (gfc_se * se, gfc_ref * ref, gfc_expr *expr, gfc_typespec *ts) case INQUIRY_KIND: res = build_int_cst (gfc_typenode_for_spec (&expr->ts), ts->kind); + se->string_length = NULL_TREE; break; case INQUIRY_LEN: res = fold_convert (gfc_typenode_for_spec (&expr->ts), se->string_length); + se->string_length = NULL_TREE; break; default: