1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
index 7096aae..03930f5 100644
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -597,7 +597,7 @@ package body Sem_Aggr is
 
                elsif Expr_Value (This_Low) /= Expr_Value (Aggr_Low (Dim)) then
                   Set_Raises_Constraint_Error (N);
-                  Error_Msg_Warn := not GNATprove_Mode;
+                  Error_Msg_Warn := SPARK_Mode /= On;
                   Error_Msg_N ("sub-aggregate low bound mismatch<<", N);
                   Error_Msg_N ("\Constraint_Error [<<", N);
                end if;
@@ -611,7 +611,7 @@ package body Sem_Aggr is
                  Expr_Value (This_High) /= Expr_Value (Aggr_High (Dim))
                then
                   Set_Raises_Constraint_Error (N);
-                  Error_Msg_Warn := not GNATprove_Mode;
+                  Error_Msg_Warn := SPARK_Mode /= On;
                   Error_Msg_N ("sub-aggregate high bound mismatch<<", N);
                   Error_Msg_N ("\Constraint_Error [<<", N);
                end if;
@@ -1456,7 +1456,7 @@ package body Sem_Aggr is
 
          if OK_BH and then OK_AH and then Val_BH < Val_AH then
             Set_Raises_Constraint_Error (N);
-            Error_Msg_Warn := not GNATprove_Mode;
+            Error_Msg_Warn := SPARK_Mode /= On;
             Error_Msg_N ("upper bound out of range<<", AH);
             Error_Msg_N ("\Constraint_Error [<<", AH);
 
@@ -1500,14 +1500,14 @@ package body Sem_Aggr is
 
          if OK_L and then Val_L > Val_AL then
             Set_Raises_Constraint_Error (N);
-            Error_Msg_Warn := not GNATprove_Mode;
+            Error_Msg_Warn := SPARK_Mode /= On;
             Error_Msg_N ("lower bound of aggregate out of range<<", N);
             Error_Msg_N ("\Constraint_Error [<<", N);
          end if;
 
          if OK_H and then Val_H < Val_AH then
             Set_Raises_Constraint_Error (N);
-            Error_Msg_Warn := not GNATprove_Mode;
+            Error_Msg_Warn := SPARK_Mode /= On;
             Error_Msg_N ("upper bound of aggregate out of range<<", N);
             Error_Msg_N ("\Constraint_Error [<<", N);
          end if;
@@ -1548,7 +1548,7 @@ package body Sem_Aggr is
 
          if Range_Len < Len then
             Set_Raises_Constraint_Error (N);
-            Error_Msg_Warn := not GNATprove_Mode;
+            Error_Msg_Warn := SPARK_Mode /= On;
             Error_Msg_N ("too many elements<<", N);
             Error_Msg_N ("\Constraint_Error [<<", N);
          end if;