From: Piotr Trojanek <trojanek@adacore.com>
Date: Thu, 25 Mar 2021 12:17:40 +0000 (+0100)
Subject: [Ada] Simplify detection of statically overlapping slices
X-Git-Tag: basepoints/gcc-13~6638
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9fcf011726d2578acfcf58eae05646fce6dae94;p=thirdparty%2Fgcc.git

[Ada] Simplify detection of statically overlapping slices

gcc/ada/

	* sem_util.adb (Denotes_Same_Object): Simplify handling of
	slices.
---

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 6727e15d2d27..b59116e540b1 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -7462,9 +7462,12 @@ package body Sem_Util is
                --  Check whether bounds are statically identical. There is no
                --  attempt to detect partial overlap of slices.
 
-               return Denotes_Same_Object (Lo1, Lo2)
-                        and then
-                      Denotes_Same_Object (Hi1, Hi2);
+               return Is_OK_Static_Expression (Lo1)
+                 and then Is_OK_Static_Expression (Lo2)
+                 and then Is_OK_Static_Expression (Hi1)
+                 and then Is_OK_Static_Expression (Hi2)
+                 and then Expr_Value (Lo1) = Expr_Value (Lo2)
+                 and then Expr_Value (Hi1) = Expr_Value (Hi2);
             end;
          end if;
 
@@ -7485,20 +7488,6 @@ package body Sem_Util is
       then
          return Denotes_Same_Object (A1, Renamed_Entity (Entity (A2)));
 
-      --  In the recursion, integer literals appear as slice bounds
-
-      elsif Nkind (A1) = N_Integer_Literal
-        and then Nkind (A2) = N_Integer_Literal
-      then
-         return Intval (A1) = Intval (A2);
-
-      --  Likewise for character literals
-
-      elsif Nkind (A1) = N_Character_Literal
-        and then Nkind (A2) = N_Character_Literal
-      then
-         return Char_Literal_Value (A1) = Char_Literal_Value (A2);
-
       else
          return False;
       end if;