[Ada] Set Raises_CE flag only in Apply_Compile_Time_Constraint_Error
authorPiotr Trojanek <trojanek@adacore.com>
Fri, 8 Jan 2021 20:43:10 +0000 (21:43 +0100)
committerPierre-Marie de Rodat <derodat@adacore.com>
Thu, 6 May 2021 07:51:31 +0000 (03:51 -0400)
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.

gcc/ada/sem_ch4.adb
gcc/ada/sem_eval.adb
gcc/ada/sem_util.adb

index 59ce28e..15b4999 100644 (file)
@@ -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;
 
index a1e32f9..9b272d2 100644 (file)
@@ -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;
 
index 86dd95b..551ad9f 100644 (file)
@@ -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;