From patchwork Mon Jun 11 09:23:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 927577 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-479442-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="A2G6r0Ex"; 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 4146zK3mQ1z9s01 for ; Mon, 11 Jun 2018 19:24:29 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=Au8eH5tDhl4ml3Qn7MGw0LuA+7uUNYYvyU4Gm4RpR4mSgS5ClA BWQHXtCSYWtK0HxtCi0z1aAsox7AYrWlDhaL8uvc6eHyenIs/GNkfjqIJVpnWyt5 hp7fXd46T1Tbsavg8eIWJz9EmpCU+32YgCMQCb5btvGyiVFTVxzhXd9Uo= 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 :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=ZZUWnw8z6v+SP53GkH1VpWPsFsY=; b=A2G6r0ExIrXOGNUawfbE isFrFnAon43Vom+9ANeupB/UlRH1JPIaY4aydAzkgRoZNHReF8mB5TC009gLbQPm A2bRDpQZIByD5rgwTimpsTGTWZYmZUQ4TsNTvYjJeHk7HFcNn9uTufGskfqPfmFX OHCeEo6pJwKd1HnJAwFl2TI= Received: (qmail 33654 invoked by alias); 11 Jun 2018 09:23:44 -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 33496 invoked by uid 89); 11 Jun 2018 09:23:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1154 X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 11 Jun 2018 09:23:42 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id B5485560ED; Mon, 11 Jun 2018 05:23:40 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id R80tfRQZpFL1; Mon, 11 Jun 2018 05:23:40 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id A44E4560EC; Mon, 11 Jun 2018 05:23:40 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id A364854C; Mon, 11 Jun 2018 05:23:40 -0400 (EDT) Date: Mon, 11 Jun 2018 05:23:40 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Yannick Moy Subject: [Ada] Mark parameters as coming from source for GNATprove Message-ID: <20180611092340.GA135072@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes When building a separate subprogram declaration for possible inlining of local subprograms in GNATprove mode, correctly mark subprogram parameters as coming from source. This has no impact on compilation. Tested on x86_64-pc-linux-gnu, committed on trunk 2018-06-11 Yannick Moy gcc/ada/ * sem_ch6.adb (Build_Subprogram_Declaration): Mark parameters as coming from source. --- gcc/ada/sem_ch6.adb +++ gcc/ada/sem_ch6.adb @@ -2712,6 +2712,22 @@ package body Sem_Ch6 is Specification => Copy_Subprogram_Spec (Body_Spec)); Set_Comes_From_Source (Subp_Decl, True); + -- Also mark parameters as coming from source + + if Present (Parameter_Specifications (Specification (Subp_Decl))) then + declare + Form : Entity_Id; + begin + Form := + First (Parameter_Specifications (Specification (Subp_Decl))); + + while Present (Form) loop + Set_Comes_From_Source (Defining_Identifier (Form), True); + Next (Form); + end loop; + end; + end if; + -- Relocate the aspects and relevant pragmas from the subprogram body -- to the generated spec because it acts as the initial declaration.