From 853f7f8ba8ff3ae7eff0678a5d28273ba951ba1d Mon Sep 17 00:00:00 2001 From: Ed Schonberg Date: Wed, 1 Jul 2020 20:25:09 -0400 Subject: [PATCH] [Ada] Attribute Img on derived types gcc/ada/ * exp_imgv.adb (Expand_Image_Attribute): Refine previous patch to use root type (and not base type) on enumeration types. --- gcc/ada/exp_imgv.adb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/ada/exp_imgv.adb b/gcc/ada/exp_imgv.adb index 731d01062e5..a3c73fa4f09 100644 --- a/gcc/ada/exp_imgv.adb +++ b/gcc/ada/exp_imgv.adb @@ -481,9 +481,15 @@ package body Exp_Imgv is -- Ada 2020 allows 'Image on private types, so fetch the underlying -- type to obtain the structure of the type. We use the base type, - -- not the root type, to handle properly derived types. + -- not the root type, to handle properly derived types, but we use + -- the root type for enumeration types, because the literal map is + -- attached to the root. Should be inherited ??? - Rtyp := Underlying_Type (Base_Type (Ptyp)); + if Is_Enumeration_Type (Ptyp) then + Rtyp := Underlying_Type (Root_Type (Ptyp)); + else + Rtyp := Underlying_Type (Base_Type (Ptyp)); + end if; -- Enable speed-optimized expansion of user-defined enumeration types -- if we are compiling with optimizations enabled and enumeration type -- 2.30.2