]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
[Ada] Fix validity checking on renamed Old attribute prefix
authorPiotr Trojanek <trojanek@adacore.com>
Mon, 8 Aug 2022 14:10:36 +0000 (16:10 +0200)
committerMarc Poulhiès <poulhies@adacore.com>
Mon, 12 Sep 2022 08:16:51 +0000 (10:16 +0200)
Prefix of attribute Old is captured either as an object renaming or as
an object declaration. This is now taken into account when applying
validity checks.

gcc/ada/

* exp_attr.adb (Expand_N_Attribute_Reference [Attribute_Old]):
Adapt to object declaration being rewritten into object renaming.

gcc/ada/exp_attr.adb

index 6f49db70a3eb576a01644a244b033359a6b112bc..0e79b5d10cd7a1ea9de7428c207b8fc3b1f9d602 100644 (file)
@@ -5088,7 +5088,17 @@ package body Exp_Attr is
          --  to reflect the new placement of the prefix.
 
          if Validity_Checks_On and then Validity_Check_Operands then
-            Ensure_Valid (Expression (Decl));
+
+            --  Object declaration that captures the attribute prefix might
+            --  be rewritten into object renaming declaration.
+
+            if Nkind (Decl) = N_Object_Declaration then
+               Ensure_Valid (Expression (Decl));
+            else
+               pragma Assert (Nkind (Decl) = N_Object_Renaming_Declaration
+                              and then Is_Rewrite_Substitution (Decl));
+               Ensure_Valid (Name (Decl));
+            end if;
          end if;
 
          Rewrite (N, New_Occurrence_Of (Temp, Loc));