From: Léo Creuse <creuse@adacore.com>
Date: Tue, 18 Jul 2023 09:08:23 +0000 (+0200)
Subject: ada: Emit SCOs for nested decisions in quantified expressions
X-Git-Tag: basepoints/gcc-15~7242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fef55ece2345a14d351a89cfd611482bb9a025f;p=thirdparty%2Fgcc.git

ada: Emit SCOs for nested decisions in quantified expressions

The tree traversal for decision SCO emission did not recurse in the
iterator specification or loop parameter specification of quantified
expressions, resulting in missing coverage obligations for nested
decisions. This change fixes this by traversing all the attributes
of quantified expressions nodes.

gcc/ada/

	* par_sco.adb (Process_Decisions): Traverse all attributes of
	quantified expressions nodes.
---

diff --git a/gcc/ada/par_sco.adb b/gcc/ada/par_sco.adb
index ce7de7f3d795..5e65fa25de1d 100644
--- a/gcc/ada/par_sco.adb
+++ b/gcc/ada/par_sco.adb
@@ -829,8 +829,15 @@ package body Par_SCO is
 
             when N_Quantified_Expression =>
                declare
-                  Cond : constant Node_Id := Condition (N);
+                  Cond   : constant Node_Id := Condition (N);
+                  I_Spec : Node_Id := Empty;
                begin
+                  if Present (Iterator_Specification (N)) then
+                     I_Spec := Iterator_Specification (N);
+                  else
+                     I_Spec := Loop_Parameter_Specification (N);
+                  end if;
+                  Process_Decisions (I_Spec, 'X', Pragma_Sloc);
                   Process_Decisions (Cond, 'W', Pragma_Sloc);
                   return Skip;
                end;