From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 3837B3857402; Tue, 21 Sep 2021 15:27:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3837B3857402 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-3752] [Ada] SCOs: generate 'P' decisions for [Type_]Invariant pragmas X-Act-Checkin: gcc X-Git-Author: Matthieu Eyraud X-Git-Refname: refs/heads/master X-Git-Oldrev: bd413702ce3106573655490668bdf8dcd6a680c9 X-Git-Newrev: 57fb9d3820cd955ba0af1baadb27cd9a756a87c8 Message-Id: <20210921152756.3837B3857402@sourceware.org> Date: Tue, 21 Sep 2021 15:27:56 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Sep 2021 15:27:56 -0000 https://gcc.gnu.org/g:57fb9d3820cd955ba0af1baadb27cd9a756a87c8 commit r12-3752-g57fb9d3820cd955ba0af1baadb27cd9a756a87c8 Author: Matthieu Eyraud Date: Wed Jul 7 19:33:25 2021 +0200 [Ada] SCOs: generate 'P' decisions for [Type_]Invariant pragmas gcc/ada/ * par_sco.adb (Traverse_One): Add support for pragma Invariant / Type_Invariant. Diff: --- gcc/ada/par_sco.adb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gcc/ada/par_sco.adb b/gcc/ada/par_sco.adb index b4f76091f44..513275a495a 100644 --- a/gcc/ada/par_sco.adb +++ b/gcc/ada/par_sco.adb @@ -2248,6 +2248,8 @@ package body Par_SCO is | Name_Loop_Invariant | Name_Postcondition | Name_Precondition + | Name_Type_Invariant + | Name_Invariant => -- For Assert/Check/Precondition/Postcondition, we -- must generate a P entry for the decision. Note @@ -2256,7 +2258,10 @@ package body Par_SCO is -- on when we output the decision line in Put_SCOs, -- depending on setting by Set_SCO_Pragma_Enabled. - if Nam = Name_Check then + if Nam = Name_Check + or else Nam = Name_Type_Invariant + or else Nam = Name_Invariant + then Next (Arg); end if; @@ -2285,8 +2290,7 @@ package body Par_SCO is -- never disabled. -- Should generate P decisions (not X) for assertion - -- related pragmas: [Type_]Invariant, - -- [{Static,Dynamic}_]Predicate??? + -- related pragmas: [{Static,Dynamic}_]Predicate??? when others => Process_Decisions_Defer (N, 'X');