From: Piotr Trojanek <trojanek@adacore.com>
Date: Fri, 8 Jan 2021 20:43:10 +0000 (+0100)
Subject: [Ada] Set Raises_CE flag only in Apply_Compile_Time_Constraint_Error
X-Git-Tag: basepoints/gcc-13~7771
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0632f8686633a436f05425f01276f35aa29438c1;p=thirdparty%2Fgcc.git

[Ada] Set Raises_CE flag only in Apply_Compile_Time_Constraint_Error

gcc/ada/

	* sem_ch4.adb (Analyze_Selected_Component): Remove explicit call
	to Set_Raises_Constraint_Error on statically missing component.
	* sem_eval.adb (Eval_Arithmetic_Op): Likewise for static
	divisions by integer and real zeros.
	* sem_util.adb (Apply_Compile_Time_Constraint_Error): Call
	Set_Raises_Constraint_Error before exiting early in GNATprove
	mode.
---

diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb
index 59ce28ea6d96..15b499938c2f 100644
--- a/gcc/ada/sem_ch4.adb
+++ b/gcc/ada/sem_ch4.adb
@@ -5452,8 +5452,6 @@ package body Sem_Ch4 is
                        (N, "component not present in }??",
                         CE_Discriminant_Check_Failed,
                         Ent => Prefix_Type);
-
-                     Set_Raises_Constraint_Error (N);
                      return;
                   end if;
 
diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb
index a1e32f9c1724..9b272d258b4b 100644
--- a/gcc/ada/sem_eval.adb
+++ b/gcc/ada/sem_eval.adb
@@ -2124,7 +2124,6 @@ package body Sem_Eval is
                      Apply_Compile_Time_Constraint_Error
                        (N, "division by zero", CE_Divide_By_Zero,
                         Warn => not Stat or SPARK_Mode = On);
-                     Set_Raises_Constraint_Error (N);
                      return;
 
                   --  Otherwise we can do the division
@@ -2226,7 +2225,6 @@ package body Sem_Eval is
                if UR_Is_Zero (Right_Real) then
                   Apply_Compile_Time_Constraint_Error
                     (N, "division by zero", CE_Divide_By_Zero);
-                  Set_Raises_Constraint_Error (N);
                   return;
                end if;
 
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 86dd95b7ec01..551ad9f28ab0 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -1436,6 +1436,7 @@ package body Sem_Util is
       --  generate a check message.
 
       if GNATprove_Mode then
+         Set_Raises_Constraint_Error (N);
          return;
       end if;