Routines that examine the parent chain of a subexpression don't need to
cross the subprogram or package boundaries and go until the very root of
the compilation unit.
Tested on x86_64-pc-linux-gnu, committed on trunk
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.
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
--- 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;