From: Piotr Trojanek <trojanek@adacore.com>
Date: Thu, 8 Aug 2024 08:59:57 +0000 (+0200)
Subject: ada: Remove repeated guards in validity checks
X-Git-Tag: basepoints/gcc-16~6188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78acc6d85f972102b92e803bef0aac0afdb1ca9e;p=thirdparty%2Fgcc.git

ada: Remove repeated guards in validity checks

Routine Insert_Valid_Check only applies checks when Expr_Known_Valid
query returns False; there is no need to call this query before
inserting checks.

Code cleanup; behavior is unaffected.

gcc/ada/

	* exp_imgv.adb (Expand_User_Defined_Enumeration_Image)
	(Expand_Image_Attribute): Remove redundant guards.
---

diff --git a/gcc/ada/exp_imgv.adb b/gcc/ada/exp_imgv.adb
index e5d84cc52e3..ce052c13c88 100644
--- a/gcc/ada/exp_imgv.adb
+++ b/gcc/ada/exp_imgv.adb
@@ -896,9 +896,7 @@ package body Exp_Imgv is
          --  Apply a validity check, since it is a bit drastic to get a
          --  completely junk image value for an invalid value.
 
-         if not Expr_Known_Valid (Expr) then
-            Insert_Valid_Check (Expr);
-         end if;
+         Insert_Valid_Check (Expr);
 
          --  Generate:
          --    P1 : constant Natural := Typ'Pos (Typ?(Expr));
@@ -1249,9 +1247,7 @@ package body Exp_Imgv is
             --  Apply a validity check, since it is a bit drastic to get a
             --  completely junk image value for an invalid value.
 
-            if not Expr_Known_Valid (Expr) then
-               Insert_Valid_Check (Expr);
-            end if;
+            Insert_Valid_Check (Expr);
 
             Enum_Case := True;
          end if;