From patchwork Wed Feb 24 14:05:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Richard Thomas X-Patchwork-Id: 1443896 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@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=wIENMcD0; 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 4DlyPW3Mnjz9sS8 for ; Thu, 25 Feb 2021 01:05:48 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 29222394EC2E; Wed, 24 Feb 2021 14:05:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 29222394EC2E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1614175544; bh=vZFDyfb13eRmXo9vuJ7h73rz/2mavz6MLP9oJC5Uvk0=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=wIENMcD0xizKJGY1zKktbmINXqpk5s9pM4quu9YlGQwxOGWI2ARTqfHDLlb5SferV 9DkdXOzM9DuYXe9AekwemQ22wdeOUsxjynbQUgNY4ciywlc/IZULf8jhybfstFsyyx /1STiB6CmChI3aeL2Dl/49RSyw0WJcGdWETwbK8I= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by sourceware.org (Postfix) with ESMTPS id C263B385482D; Wed, 24 Feb 2021 14:05:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C263B385482D Received: by mail-lf1-x131.google.com with SMTP id e7so3222334lft.2; Wed, 24 Feb 2021 06:05:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=+QY9cU32K1xiX85ywGthya78VgIkK/5KeXfryqoJZ/w=; b=UsLjzMz6vfUXw7MCUVLrXHSGsbGBkQPJHdBRNbIER1hiYwlI7rFctc6n/dQJCSvP1Q AZFy/WQVFLfy85NobYszAgUsybVeilR1hWY4KQZ1ZYkAi+oknunBuOWMCKNTlUC3KAwx xHzATogW4b/9emG5gi833MZLJdZ86zCqDOQdcUzFFfEC1CLNHIbM4lr7S2hEFf3v6bZZ NF77A79jEiCDoJ3hqhjUKmizRYNejwBk/3Bg9PFdsK7lH2ftT1bolpJJLToNVYWpE8T3 DVqNm98pOOsNnUGw+8sHy2fXasq87F4UeZaU9oys2eje4KTbfxmVhRXnGfbuFnG062U1 bUWQ== X-Gm-Message-State: AOAM533zICo7p9ZvHqgf+v+7GYjZVWJ2D5925vi4X5zBTUOU76CGo7Oi 3Gkqs6K217NSQAzB+HytkarqK+QI/vCr8apMFnQVOasgKvA= X-Google-Smtp-Source: ABdhPJxMPld7+RZma2IiBXjuYdq1LZwXvhN7rTgyc7ibZoTDcsZjoEQL8/KVqEDlOd5Ddzu+HKnjp71AZEDxamvkL5Q= X-Received: by 2002:a05:6512:1310:: with SMTP id x16mr18963385lfu.19.1614175538961; Wed, 24 Feb 2021 06:05:38 -0800 (PST) MIME-Version: 1.0 Date: Wed, 24 Feb 2021 14:05:27 +0000 Message-ID: Subject: [Patch, fortran] PR99125 - [9/10/11 Regression] ICE: gimplification failed (gimplify.c:15068) To: "fortran@gcc.gnu.org" , gcc-patches X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, HTML_MESSAGE, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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 Cc: gerhard.steinmetz.fortran@t-online.de Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This problem was caused by the compiler attempting to use 0 as an lvalue and to assign 0 to it. Understandably, this upset the gimplifer quite a bit :-) The fix is to use the ss_info string length for deferred length character components, where the hidden string length component has been used. The use of a constant as an lvalue is prevented by checking that the expression string length is a variable. Regtests on FC33/x86_64 - OK for all three branches? Paul Fortran: Fix for class defined operators [PR99125]. 2021-02-23 Paul Thomas gcc/fortran PR fortran/99125 * trans-array.c (gfc_conv_expr_descriptor): For deferred length length components use the ss_info string length instead of gfc_get_expr_charlen. Make sure that the deferred string length is a variable before assigning to it. Otherwise use the expr. * trans-expr.c (gfc_conv_string_length): Make sure that the deferred string length is a variable before assigning to it. gcc/testsuite/ PR fortran/99125 * gfortran.dg/alloc_deferred_comp_1.f90: New test. diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index c6725659093..e85d63c3539 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -7670,15 +7670,21 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr) /* Set the string_length for a character array. */ if (expr->ts.type == BT_CHARACTER) { - se->string_length = gfc_get_expr_charlen (expr); + if (deferred_array_component) + se->string_length = ss_info->string_length; + else + se->string_length = gfc_get_expr_charlen (expr); + if (VAR_P (se->string_length) && expr->ts.u.cl->backend_decl == se->string_length) tmp = ss_info->string_length; else tmp = se->string_length; - if (expr->ts.deferred) + if (expr->ts.deferred && VAR_P (expr->ts.u.cl->backend_decl)) gfc_add_modify (&se->pre, expr->ts.u.cl->backend_decl, tmp); + else + expr->ts.u.cl->backend_decl = tmp; } /* If we have an array section, are assigning or passing an array diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index e61492485b8..9d178360fc3 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -2471,7 +2471,7 @@ gfc_conv_string_length (gfc_charlen * cl, gfc_expr * expr, stmtblock_t * pblock) se.expr, build_zero_cst (TREE_TYPE (se.expr))); gfc_add_block_to_block (pblock, &se.pre); - if (cl->backend_decl) + if (cl->backend_decl && VAR_P (cl->backend_decl)) gfc_add_modify (pblock, cl->backend_decl, se.expr); else cl->backend_decl = gfc_evaluate_now (se.expr, pblock);