From: Yannick Moy <moy@adacore.com>
Date: Wed, 26 May 2021 08:49:14 +0000 (+0200)
Subject: [Ada] Fix on computation of packed array size in case of error
X-Git-Tag: basepoints/gcc-13~6164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=242c0f4772c6697ba0b27853f153a13970bbded9;p=thirdparty%2Fgcc.git

[Ada] Fix on computation of packed array size in case of error

gcc/ada/

	* layout.adb (Layout_Type): Add guard before calling Expr_Value.
---

diff --git a/gcc/ada/layout.adb b/gcc/ada/layout.adb
index cbc296a6e45f..ee8e281785e9 100644
--- a/gcc/ada/layout.adb
+++ b/gcc/ada/layout.adb
@@ -513,18 +513,28 @@ package body Layout is
 
             begin
                Get_Index_Bounds (First_Index (E), Lo, Hi);
-               Siz := (Expr_Value (Hi) - Expr_Value (Lo) + 1)
-                 * Component_Size (E);
 
-               --  Do not overwrite a different value of 'Size specified
-               --  explicitly by the user. In that case, also do not set Esize.
+               --  Even if the bounds are known at compile time, they could
+               --  have been replaced by an error node. Check each bound
+               --  explicitly.
 
-               if Unknown_RM_Size (E) or else RM_Size (E) = Siz then
-                  Set_RM_Size (E, Siz);
+               if Compile_Time_Known_Value (Lo)
+                 and then Compile_Time_Known_Value (Hi)
+               then
+                  Siz := (Expr_Value (Hi) - Expr_Value (Lo) + 1)
+                    * Component_Size (E);
+
+                  --  Do not overwrite a different value of 'Size specified
+                  --  explicitly by the user. In that case, also do not set
+                  --  Esize.
 
-                  if Unknown_Esize (E) then
-                     Siz := ((Siz + (Abits - 1)) / Abits) * Abits;
-                     Set_Esize (E, Siz);
+                  if Unknown_RM_Size (E) or else RM_Size (E) = Siz then
+                     Set_RM_Size (E, Siz);
+
+                     if Unknown_Esize (E) then
+                        Siz := ((Siz + (Abits - 1)) / Abits) * Abits;
+                        Set_Esize (E, Siz);
+                     end if;
                   end if;
                end if;
             end;