From patchwork Sat Sep 20 16:33:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Dominique_d=27Humi=C3=A8res?= X-Patchwork-Id: 391515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 D2C58140161 for ; Sun, 21 Sep 2014 02:34:04 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :to:cc:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= VRA/Y4JGFmvm9zsThbJ0vUVUYWZ8t0ntRwF17eyUCVcF38j5b3AwPy4o1JeP2VJm 5hgSAQDxv2+lwMK5s6QVaQhqZ6rZusCh5RoWyKoNI1dEobX9219AImNFxuTAS1Sd GAzA5wIDVDyOAWF+e2n3Y0m3HN16mJt8YCn3cxK5xGU= 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:date :to:cc:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=Vy28xM bUfCkIsQLa/m8dUdcBnOg=; b=o64IWU8Ppo/5I340SahbvLxxzveyLN/ZyzJdBu BeqyFnDbuLOCRKoesYbtIYioplQXYx6Fa468tVVnt15g0oC5ZQ9SItqzDMAIBIMt jb3kMoGsNOBr7VD3maEErRbXlx5N4moAJv2UCX3JlJmrzmTUKov2kFlsoCv5Ved4 vPS48= Received: (qmail 5689 invoked by alias); 20 Sep 2014 16:33:57 -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 5668 invoked by uid 89); 20 Sep 2014 16:33:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.1 required=5.0 tests=AWL, BAYES_50, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: nef2.ens.fr Received: from nef2.ens.fr (HELO nef2.ens.fr) (129.199.96.40) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 20 Sep 2014 16:33:54 +0000 Received: from mailhost.lps.ens.fr (tournesol.lps.ens.fr [129.199.120.1]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id s8KGXpBw060319 ; Sat, 20 Sep 2014 18:33:51 +0200 (CEST) X-Envelope-To: gcc-patches@gcc.gnu.org Received: from localhost (localhost [127.0.0.1]) by mailhost.lps.ens.fr (Postfix) with ESMTP id 6E9EE6F; Sat, 20 Sep 2014 18:33:51 +0200 (CEST) Received: from mailhost.lps.ens.fr ([127.0.0.1]) by localhost (tournesol.lps.ens.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Lrtq2rzoDohL; Sat, 20 Sep 2014 18:33:51 +0200 (CEST) Received: by mailhost.lps.ens.fr (Postfix, from userid 8513) id 5CC73100; Sat, 20 Sep 2014 18:33:51 +0200 (CEST) Date: Sat, 20 Sep 2014 18:33:51 +0200 To: fortran@gcc.gnu.org Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] remove duplicated lines in gcc/fortran/resolve.c User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Message-Id: <20140920163351.5CC73100@mailhost.lps.ens.fr> From: dominiq@lps.ens.fr (Dominique Dhumieres) AFAICT the lines 11200-11222 in gcc/fortran/resolve.c are a copy of the lines 11176-11198. The following patch removes the duplicated lines. OK for the trunk? Dominique --- ../_clean/gcc/fortran/resolve.c 2014-09-20 13:56:57.000000000 +0200 +++ gcc/fortran/resolve.c 2014-09-20 14:01:42.000000000 +0200 @@ -11184,30 +11184,6 @@ resolve_fl_procedure (gfc_symbol *sym, i && !arg->sym->ts.u.derived->attr.use_assoc && !gfc_check_symbol_access (arg->sym->ts.u.derived) && !gfc_notify_std (GFC_STD_F2003, "Procedure '%s' in " - "PUBLIC interface '%s' at %L " - "takes dummy arguments of '%s' which " - "is PRIVATE", iface->sym->name, - sym->name, &iface->sym->declared_at, - gfc_typename(&arg->sym->ts))) - { - /* Stop this message from recurring. */ - arg->sym->ts.u.derived->attr.access = ACCESS_PUBLIC; - return false; - } - } - } - - /* PUBLIC interfaces may expose PRIVATE procedures that take types - PRIVATE to the containing module. */ - for (iface = sym->generic; iface; iface = iface->next) - { - for (arg = gfc_sym_get_dummy_args (iface->sym); arg; arg = arg->next) - { - if (arg->sym - && arg->sym->ts.type == BT_DERIVED - && !arg->sym->ts.u.derived->attr.use_assoc - && !gfc_check_symbol_access (arg->sym->ts.u.derived) - && !gfc_notify_std (GFC_STD_F2003, "Procedure '%s' in " "PUBLIC interface '%s' at %L takes " "dummy arguments of '%s' which is " "PRIVATE", iface->sym->name,