Merge branch 'master' into devel/modula-2.

[gcc.git] / gcc / ada / sem_warn.adb

diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb
index b23be725437a01483fcc147f9b385ec5d7f23ae9..1d73f21e7dec627d752e2e0b13503a43b6c83b52 100644 (file)
--- a/gcc/ada/sem_warn.adb
+++ b/gcc/ada/sem_warn.adb
@@ -3401,9 +3401,14 @@ package body Sem_Warn is
             False_Result => False_Result);
 
          --  Warn on a possible evaluation to False / True in the presence of
-         --  invalid values.
+         --  invalid values. But issue no warning for an assertion expression
+         --  (or a subexpression thereof); in particular, we don't want a
+         --  warning about an assertion that will always succeed.
 
-         if True_Result then
+         if In_Assertion_Expression_Pragma (Op) then
+            null;
+
+         elsif True_Result then
             Error_Msg_N
               ("condition can only be False if invalid values present?c?", Op);