From: Steve Baird <baird@adacore.com>
Date: Tue, 11 Oct 2022 22:21:39 +0000 (-0700)
Subject: ada: Put_Image aspect spec incorrectly not inherited
X-Git-Tag: basepoints/gcc-14~3482
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=748976cfc867cb387f0f8180c48233e883223f93;p=thirdparty%2Fgcc.git

ada: Put_Image aspect spec incorrectly not inherited

In some cases, a Put_Image aspect specification for a scalar type was not
correctly inherited by a descendant of that type.

gcc/ada/

	* exp_put_image.adb
	(Image_Should_Call_Put_Image): Correctly handle the case of an
	inherited Put_Image aspect specification for a scalar type.
---

diff --git a/gcc/ada/exp_put_image.adb b/gcc/ada/exp_put_image.adb
index 50e0569a8017..c489ad41fd10 100644
--- a/gcc/ada/exp_put_image.adb
+++ b/gcc/ada/exp_put_image.adb
@@ -1039,13 +1039,13 @@ package body Exp_Put_Image is
       end if;
 
       --  In Ada 2022, T'Image calls T'Put_Image if there is an explicit
-      --  aspect_specification for Put_Image, or if U_Type'Image is illegal
-      --  in pre-2022 versions of Ada.
+      --  (or inherited) aspect_specification for Put_Image, or if
+      --  U_Type'Image is illegal in pre-2022 versions of Ada.
 
       declare
          U_Type : constant Entity_Id := Underlying_Type (Entity (Prefix (N)));
       begin
-         if Present (TSS (U_Type, TSS_Put_Image)) then
+         if Present (Find_Aspect (U_Type, Aspect_Put_Image)) then
             return True;
          end if;