From patchwork Wed Oct 11 08:48:17 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: 151217 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp390506vqb; Wed, 11 Oct 2023 01:49:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfdCxsiWtVEbufNmUtseOt0MjfYeZNjT5/HnXKDkTm4ZpLT2eUUWcJJOwJxXzEeldPzD31 X-Received: by 2002:a17:906:1bb2:b0:9b9:a1dd:5105 with SMTP id r18-20020a1709061bb200b009b9a1dd5105mr15102815ejg.50.1697014161052; Wed, 11 Oct 2023 01:49:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697014161; cv=none; d=google.com; s=arc-20160816; b=aL90VJsqHU3VKDXGhogNhAZFj1+zgZIJ8PGvfSbRkDJiqwAycy8AbO58pWyDK2eVdV khZX92Lw7Gp7dD/RWdf9xFD0YlS7jIyg74drYUOwgq4ziyXJO/R1dstun+OVJE352yZp yy8dzvmCHJjWLRrn8jc1x6b/o1aFvBhVlJUymJsC0opZJkiee1HedKkFRpt8BwIUpGZ1 e7SG4bwOxCKozlAtAy0Bu/R//djnLO26l+EScAxipz+4F+6qTqo3eWwyhped34tt3zdg YYuZlsHHfvh65bCMtRI/vRh7biHBaYK7zQSX969qJKnBMLBZ09CT36PnSfVveu92NRyd Hx6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:to:subject:message-id:date:from :mime-version:dkim-signature:dmarc-filter:delivered-to; bh=mfqf50pRfr7k2k9yU+5HB0eCFz+gAYcuDBa9glOPurQ=; fh=GSsCLkWBfXoFiGnDCFSEBskKkonF6jVDtKqqw8KzaAo=; b=Gh5Lhj38WQFeE83XtmXMRyE4yp4rEndbOiC65sS8PqhAwKqmaBHUDpzHTMoX8SPbaN rFB2I3UX6woE+imOSamJXo4Nvska04653BBh80S1iPqrIXJjWv5L/JTn+UNztnSjqLdl 2oqwWqKOwEW4pbjlt3/G+1fF0aFTtkAWjQq/jqNTxXFaIt1Dr6EVWuFlYXQg+5x5LrMw dtx/j1u0Mtnow61sv25dmOHG4qVhf9/gXwB/xyF8dRrCom+ey8ZGZMbddELFsIHoaR7m zNvy7NfA2u6P6Z8/yZpKi5ay6QcOUu7fYbzYBCfDcYLQWqnk5mGru/2j3x25VhrkZjQx 71Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=SgLUuPeo; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id b16-20020a170906039000b009adefc93b5fsi5972164eja.440.2023.10.11.01.49.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 01:49:21 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=SgLUuPeo; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 950713856944 for ; Wed, 11 Oct 2023 08:49:01 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by sourceware.org (Postfix) with ESMTPS id 69F0D3858025; Wed, 11 Oct 2023 08:48:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 69F0D3858025 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-5859b2eaa67so3742794a12.0; Wed, 11 Oct 2023 01:48:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697014109; x=1697618909; darn=gcc.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=4zuy7a4kkg/nozhkqUcNqxJXG+0jSCCREQWcvvhtwAU=; b=SgLUuPeoQUj2WpLmo4qJLc0ykCIg3VsQmWWTlRfVqxNtcnPRGT+ziGorYUEfd1r6pu 8BkGzYeMO02mS4p8TA6g31w0yJA5cPcnIM6R9vfV4QGnbJgySoRHx17EGabd/RpJzoD1 XRlzRtUqCjAPziUcNYnhw5fCVdN27dp1zwesDAXi1E1niuHs8Q6bkXx+tBVQAQQ4WRf3 XATS+mxPiDwQ8tpbue8uvWnimmd2exWMNFFRZbQI9o3Ly1ErbpwWKqqZYNP+dqVJ2Rgo KccewM2hYsyPKZ0HKUTJt+6/LvJmUoIPo0sV5iYsswKDhrDD3Pcx0gsPsWGP29hKoYVf hxrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697014109; x=1697618909; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4zuy7a4kkg/nozhkqUcNqxJXG+0jSCCREQWcvvhtwAU=; b=HFyVwFtCh8Ze25kfsaaSpTSicbV7IAXwaVxwhAi9qyHD5U4tDdC49P/IKKCaV9MuJz XCbPqBTxekje07oYMYt1ZjLrvPN/IVvfmPjNwMeBeSNPM9jRHVUMcg9i0SCu7mR86bBm uAp4Nta3IresaveVUBnz5nKaJ1DmpP7QKoxfT0/MBTDDcTDUifUSZhFXfoIMXHbvQwXr RwPasY9Etpj/aLshUEKvky+6SXdnAsHdW4UTCsVMSUHdnbheSLQ/c186szEBMjXx/X05 GoOWhKg4Y/h5V1vNYGmvW/jl9XzJqiLENFdrmBCP8RgROJ2ylnzLWnjLXt8GnQo+yt7E 3MgA== X-Gm-Message-State: AOJu0YzZ8d5vIElMxlkizsh/p6jdnP5BBjMnl/FcNf9LWCdO7zwcyTA8 v/QuiJV8vJWXy33qQCn7Sm57c3v0nYDodjsNRRFgs61O5bA= X-Received: by 2002:a17:90a:1541:b0:268:1355:b03e with SMTP id y1-20020a17090a154100b002681355b03emr18184693pja.38.1697014108903; Wed, 11 Oct 2023 01:48:28 -0700 (PDT) MIME-Version: 1.0 From: Paul Richard Thomas Date: Wed, 11 Oct 2023 09:48:17 +0100 Message-ID: Subject: [Patch, fortran] PR67740 - Wrong association status of allocatable character pointer in derived types To: "fortran@gcc.gnu.org" , gcc-patches X-Spam-Status: No, score=-7.7 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.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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779448320780538782 X-GMAIL-MSGID: 1779448320780538782 Hi All, The title line of the PR should have been changed a long time since. As noted in comment 5, the original problem was fixed in 10.5. This patch fixes the problem described in comments 4 and 6, where the hidden string length component was not being set in pointer assignment of character arrays. The fix regtests. OK for trunk and 13-branch? Thanks are due to Harald for bringing this to my attention. Paul Fortran: Set hidden string length for pointer components [PR67440] 2023-10-11 Paul Thomas gcc/fortran PR fortran/pr67740 * trans-expr.cc (gfc_trans_pointer_assignment): Set the hidden string length component for pointer assignment to character pointer components. gcc/testsuite/ PR fortran/87477 * gfortran.dg/pr67740.f90: New test diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc index 860b73c4968..7beefa2e69c 100644 --- a/gcc/fortran/trans-expr.cc +++ b/gcc/fortran/trans-expr.cc @@ -10403,11 +10403,36 @@ gfc_trans_pointer_assignment (gfc_expr * expr1, gfc_expr * expr2) } if (expr1->ts.type == BT_CHARACTER - && expr1->symtree->n.sym->ts.deferred - && expr1->symtree->n.sym->ts.u.cl->backend_decl - && VAR_P (expr1->symtree->n.sym->ts.u.cl->backend_decl)) + && expr1->ts.deferred) { - tmp = expr1->symtree->n.sym->ts.u.cl->backend_decl; + gfc_symbol *psym = expr1->symtree->n.sym; + tmp = NULL_TREE; + if (psym->ts.type == BT_CHARACTER) + { + gcc_assert (psym->ts.u.cl->backend_decl + && VAR_P (psym->ts.u.cl->backend_decl)); + tmp = psym->ts.u.cl->backend_decl; + } + else if (expr1->ts.u.cl->backend_decl + && VAR_P (expr1->ts.u.cl->backend_decl)) + tmp = expr1->ts.u.cl->backend_decl; + else if (TREE_CODE (lse.expr) == COMPONENT_REF) + { + gfc_ref *ref = expr1->ref; + for (;ref; ref = ref->next) + { + if (ref->type == REF_COMPONENT + && ref->u.c.component->ts.type == BT_CHARACTER + && gfc_deferred_strlen (ref->u.c.component, &tmp)) + tmp = fold_build3_loc (input_location, COMPONENT_REF, + TREE_TYPE (tmp), + TREE_OPERAND (lse.expr, 0), + tmp, NULL_TREE); + } + } + + gcc_assert (tmp); + if (expr2->expr_type != EXPR_NULL) gfc_add_modify (&block, tmp, fold_convert (TREE_TYPE (tmp), strlen_rhs));