From 2f29ceb054a350abb6d377472304ac9768eed11f Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Fri, 4 Dec 2020 13:00:10 +0100 Subject: [PATCH] [Ada] Prevent In_Check_Node routine from going too far in the parent chain gcc/ada/ * sem_util.adb (In_Check_Node): Add guard and rename Node to Par, just like it is done in surrounding routines, e.g. In_Assertion_Expression_Pragma and In_Generic_Formal_Package. --- gcc/ada/sem_util.adb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 20ec9075a51..759c727b29b 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -13878,14 +13878,20 @@ package body Sem_Util is ------------------- function In_Check_Node (N : Node_Id) return Boolean is - Node : Node_Id := Parent (N); + Par : Node_Id := Parent (N); begin - while Present (Node) loop - if Nkind (Node) in N_Raise_xxx_Error then + while Present (Par) loop + if Nkind (Par) in N_Raise_xxx_Error then return True; - end if; - Node := Parent (Node); + -- Prevent the search from going too far + + elsif Is_Body_Or_Package_Declaration (Par) then + return False; + + else + Par := Parent (Par); + end if; end loop; return False; -- 2.30.2