From: Piotr Trojanek <trojanek@adacore.com>
Date: Fri, 26 Mar 2021 08:36:49 +0000 (+0100)
Subject: [Ada] Disable wrong computation of offsets within multidimensional arrays
X-Git-Tag: basepoints/gcc-13~6634
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05447313c9acb24e0fad6305ad333077707de9ba;p=thirdparty%2Fgcc.git

[Ada] Disable wrong computation of offsets within multidimensional arrays

gcc/ada/

	* sem_util.adb (Indexed_Component_Bit_Offset): Return an unknown
	offset for components within multidimensional arrays; remove
	redundant parens.
---

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 2e102b934970..44a568404ad1 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -14827,6 +14827,12 @@ package body Sem_Util is
          return No_Uint;
       end if;
 
+      --  Do not attempt to compute offsets within multi-dimensional arrays
+
+      if Present (Next_Index (Ind)) then
+         return No_Uint;
+      end if;
+
       if Nkind (Ind) = N_Subtype_Indication then
          Ind := Constraint (Ind);
 
@@ -14843,7 +14849,7 @@ package body Sem_Util is
 
       --  Return the scaled offset
 
-      return Off * (Expr_Value (Exp) - Expr_Value (Low_Bound ((Ind))));
+      return Off * (Expr_Value (Exp) - Expr_Value (Low_Bound (Ind)));
    end Indexed_Component_Bit_Offset;
 
    -----------------------------