From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 88B48385842A; Wed, 1 Dec 2021 10:27:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 88B48385842A 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-5680] [Ada] Fix crash on pragma Compile_Time_Warning/Error X-Act-Checkin: gcc X-Git-Author: Bob Duff X-Git-Refname: refs/heads/master X-Git-Oldrev: 1010cb00c8bac6a35f3fad9fa54d2e4cab2a38ef X-Git-Newrev: 9ce9322ccc4aa873d732554c895b821c90017511 Message-Id: <20211201102721.88B48385842A@sourceware.org> Date: Wed, 1 Dec 2021 10:27:21 +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: Wed, 01 Dec 2021 10:27:21 -0000 https://gcc.gnu.org/g:9ce9322ccc4aa873d732554c895b821c90017511 commit r12-5680-g9ce9322ccc4aa873d732554c895b821c90017511 Author: Bob Duff Date: Wed Nov 17 12:06:32 2021 -0500 [Ada] Fix crash on pragma Compile_Time_Warning/Error gcc/ada/ * sem_prag.adb (Process_Compile_Time_Warning_Or_Error): Do not follow the Corresponding_Spec pointer if Acts_As_Spec is True, because Corresponding_Spec is Empty in that case, so we would exit the loop prematurely, and incorrectly think we are not inside a generic unit when we are. Diff: --- gcc/ada/sem_prag.adb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 1d5cc2535bd..9fdec53b374 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -7827,11 +7827,15 @@ package body Sem_Prag is if Compile_Time_Known_Value (Arg1x) then Validate_Compile_Time_Warning_Or_Error (N, Sloc (Arg1)); + else while Present (P) and then Nkind (P) not in N_Generic_Declaration loop - if Nkind (P) in N_Package_Body | N_Subprogram_Body then - P := Corresponding_Spec (P); + if (Nkind (P) = N_Subprogram_Body and then not Acts_As_Spec (P)) + or else Nkind (P) = N_Package_Body + then + P := Parent (Corresponding_Spec (P)); + else P := Parent (P); end if;