From patchwork Sun Nov 24 17:09:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Koenig X-Patchwork-Id: 1199976 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=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-514486-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=netcologne.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="HPuI3e0v"; dkim=pass (2048-bit key; unprotected) header.d=netcologne.de header.i=@netcologne.de header.b="Yz/EQSi5"; 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 47Lc9b6YG7z9sPW for ; Mon, 25 Nov 2019 04:10:09 +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=WHPHifLkrBeqzUAZYYmNTWQiA3JcHYvq1zdyKOmnQPcga4lhvd TTMX8ZtpRMUsThv7DYM5zt3GS4F1E8PyLeDCiuZRu4CSk5HORhvS1V5yCN0Eluzt u2NLlzCQ+OP7JprcC5gGeuyiIyDSVa0yn9HEWvq4v6zQae2JyQmqTjIu0= 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=nhk77t1CwWDyDp9Icc+g2lVli9E=; b=HPuI3e0v/tenOQRmApcJ I8gSQbq1hnVqVK6o7lPg+NyjwcQBNDhIs1xnxuoCVrtEfQFiiukBhTJMBZAuvCQL 9wFz/7zpx8JVXP/eNRPMXjDGaGDJ6epxSKUf/kigKp0dBVbqegC+xd7/1W/5J1Qc Bbew8+66HiwlD/HhYFXh0kk= Received: (qmail 72309 invoked by alias); 24 Nov 2019 17:09:58 -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 72295 invoked by uid 89); 24 Nov 2019 17:09:58 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-12.1 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy=sk:regress, handed X-HELO: cc-smtpout3.netcologne.de Received: from cc-smtpout3.netcologne.de (HELO cc-smtpout3.netcologne.de) (89.1.8.213) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 24 Nov 2019 17:09:56 +0000 Received: from cc-smtpin3.netcologne.de (cc-smtpin3.netcologne.de [89.1.8.203]) by cc-smtpout3.netcologne.de (Postfix) with ESMTP id 063B012410; Sun, 24 Nov 2019 18:09:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=netcologne.de; s=nc1116a; t=1574615393; bh=Xslse4x8E13ONyG0lcYuUbsqOmrqVYQXuXiLNSniYAI=; h=To:From:Subject:Message-ID:Date:From; b=Yz/EQSi5WI1uZ3NqCfJ+zrvSwjdPhq2VsIAwwRv0BTVu/q2BCF8AWRRTBNpQhU+GL E34XbkvsZi/c7iE+NTfITonldKyNwVGIGyr7G98iBkB3LcFFKfL4k3wpIuPk12vHOg PyqjOlev3lQ5V/abEfTG2GRK9joGn9/X4TgTm4ein22y3RS+6SeagmTpKWwGSWiypo UKGA45L0/pEZGp1yda/ig0gRN3bN4K1jQbs1zxDIdlSfMsXbSIVvx1ESU2mUCFNOCM G2KyMtM5uA9/xPhyy0+A/LMADvyD/RRbJzYQ38K+dpL7bzqSstCZ+KyExhLw6uQegy oxBJ01cD4UyaA== Received: from localhost (localhost [127.0.0.1]) by cc-smtpin3.netcologne.de (Postfix) with ESMTP id 0278611EB7; Sun, 24 Nov 2019 18:09:53 +0100 (CET) Received: from [2001:4dd6:1e9a:0:7285:c2ff:fe6c:992d] (helo=cc-smtpin3.netcologne.de) by localhost with ESMTP (eXpurgate 4.6.0) (envelope-from ) id 5ddab960-388c-7f0000012729-7f000001bad2-1 for ; Sun, 24 Nov 2019 18:09:52 +0100 Received: from [IPv6:2001:4dd6:1e9a:0:7285:c2ff:fe6c:992d] (2001-4dd6-1e9a-0-7285-c2ff-fe6c-992d.ipv6dyn.netcologne.de [IPv6:2001:4dd6:1e9a:0:7285:c2ff:fe6c:992d]) (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; Sun, 24 Nov 2019 18:09:51 +0100 (CET) To: "fortran@gcc.gnu.org" , gcc-patches From: Thomas Koenig Subject: [patch, fortran] Fix PR 91783 Message-ID: <60285894-9bf4-f78b-4dae-ff903b189c41@netcologne.de> Date: Sun, 24 Nov 2019 18:09:51 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 Hello world, this patch fixes a 10 regression in dependency checking. The approach is simple - if gfc_dep_resolver is handed references with _data, remove that. Regression-tested. OK for trunk? Regards Thomas Do not look at _data component in gfc_dep_resolver. 2019-11-24 Thomas Koenig PR fortran/91783 * dependency.c (gfc_dep_resolver): Do not look at _data component if present. 2019-11-24 Thomas Koenig PR fortran/91783 * gfortran.dg/dependency_56.f90: New test. Index: fortran/dependency.c =================================================================== --- fortran/dependency.c (Revision 278025) +++ fortran/dependency.c (Arbeitskopie) @@ -2098,6 +2098,18 @@ gfc_dep_resolver (gfc_ref *lref, gfc_ref *rref, gf gfc_dependency this_dep; bool same_component = false; + /* The refs might come in mixed, one with a _data component and one + without. Look at their next reference in order to avoid an + ICE. */ + + if (lref && lref->type == REF_COMPONENT && lref->u.c.component + && strcmp (lref->u.c.component->name, "_data") == 0) + lref = lref->next; + + if (rref && rref->type == REF_COMPONENT && rref->u.c.component + && strcmp (rref->u.c.component->name, "_data") == 0) + rref = rref->next; + this_dep = GFC_DEP_ERROR; fin_dep = GFC_DEP_ERROR; /* Dependencies due to pointers should already have been identified.