From patchwork Fri Dec 1 07:38:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Koenig X-Patchwork-Id: 843385 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-468319-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.b="LPgg6KPB"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yp5k82bK1z9tBg for ; Fri, 1 Dec 2017 18:38:52 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=DzOHasLkVDUm2d5GDj3P6whTm1S/ZJIOvREfJA+grfyS4Q9ldq 3kldCJPWFl4+WlfdxNhEDo76rIozXtjezMpJbVxT8yRRWloqUwuplbtzKd2cn1F0 /M4+NWUko2RW6Fi7syzibXiISdf9saio0Hq1+dI2VNFlXkpywXaI67jwI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=vXsyy4RFl2avopFgBeFlF7l4TPw=; b=LPgg6KPB1tbEtEOaFlpH TQ5OKnoPf7ik8dFFiqnbSK54GpVn2XRjkXBWcIRTR2cFU73nn/GGF4E4XMawRZO9 6hbAmfZwG8+zI/sIB8qZJhoeNaeB0WZmsVotBvzBw5UUviH6bHoa3B0WC7H6HkYP ldXf5z0PTajjRFLmd1O75GA= Received: (qmail 112776 invoked by alias); 1 Dec 2017 07:38:39 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 112750 invoked by uid 89); 1 Dec 2017 07:38:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_LOW, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=urban, Hx-languages-length:1594, Urban X-Spam-User: qpsmtpd, 2 recipients X-HELO: cc-smtpout2.netcologne.de Received: from cc-smtpout2.netcologne.de (HELO cc-smtpout2.netcologne.de) (89.1.8.212) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 01 Dec 2017 07:38:35 +0000 Received: from cc-smtpin3.netcologne.de (cc-smtpin3.netcologne.de [89.1.8.203]) by cc-smtpout2.netcologne.de (Postfix) with ESMTP id C5CBF12852; Fri, 1 Dec 2017 08:38:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by cc-smtpin3.netcologne.de (Postfix) with ESMTP id C2B1E11E22; Fri, 1 Dec 2017 08:38:30 +0100 (CET) Received: from [78.35.131.21] (helo=cc-smtpin3.netcologne.de) by localhost with ESMTP (eXpurgate 4.1.9) (envelope-from ) id 5a2106f6-02b7-7f0000012729-7f00000195b5-1 for ; Fri, 01 Dec 2017 08:38:30 +0100 Received: from [192.168.178.20] (xdsl-78-35-131-21.netcologne.de [78.35.131.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by cc-smtpin3.netcologne.de (Postfix) with ESMTPSA; Fri, 1 Dec 2017 08:38:28 +0100 (CET) To: "fortran@gcc.gnu.org" , gcc-patches From: Thomas Koenig Subject: [patch, fortran, committed] Fix PR 83224 Message-ID: <5226c21b-6a00-7955-1c47-01af479099f5@netcologne.de> Date: Fri, 1 Dec 2017 08:38:22 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Hello world, I just committed the attached patch as obvious and simple to trunk, r255294. Regards Thomas 2017-12-01 Thomas Koenig PR fortran/83224 * frontend-passes.c (realloc_string_callback): Handle case for which the RHS is an array expression. 2017-12-01 Thomas Koenig PR fortran/83224 * gfortran.dg/dependency_50.f90: New test. Index: frontend-passes.c =================================================================== --- frontend-passes.c (Revision 255181) +++ frontend-passes.c (Arbeitskopie) @@ -249,7 +249,7 @@ realloc_string_callback (gfc_code **c, int *walk_s return 0; expr1 = co->expr1; - if (expr1->ts.type != BT_CHARACTER || expr1->rank != 0 + if (expr1->ts.type != BT_CHARACTER || !gfc_expr_attr(expr1).allocatable || !expr1->ts.deferred) return 0; @@ -270,8 +270,9 @@ realloc_string_callback (gfc_code **c, int *walk_s if (!found_substr) return 0; } - else if (expr2->expr_type != EXPR_OP - || expr2->value.op.op != INTRINSIC_CONCAT) + else if (expr2->expr_type != EXPR_ARRAY + && (expr2->expr_type != EXPR_OP + || expr2->value.op.op != INTRINSIC_CONCAT)) return 0; if (!gfc_check_dependency (expr1, expr2, true))