From 263e2936305cb3b995db8f86ce8c60579caeeda3 Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Tue, 24 Aug 2021 23:58:40 +0200 Subject: [PATCH] [Ada] Fix handling of 'Image acting as a prefix of a slice in CodePeer gcc/ada/ * sem_res.adb (Resolve_Slice): Add custom handling of attribute Image and similar in CodePeer mode. This complements the existing custom handling of these attributes in Expand_N_Attribute_Reference. --- gcc/ada/sem_res.adb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 0d013ba..c493d5d 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -11275,10 +11275,20 @@ package body Sem_Res is end; end if; + -- In CodePeer mode the attribute Image is not expanded, so when it + -- acts as a prefix of a slice, we handle it like a call to function + -- returning an unconstrained string. Same for the Wide variants of + -- attribute Image. + elsif Is_Entity_Name (Name) or else Nkind (Name) = N_Explicit_Dereference or else (Nkind (Name) = N_Function_Call and then not Is_Constrained (Etype (Name))) + or else (CodePeer_Mode + and then Nkind (Name) = N_Attribute_Reference + and then Attribute_Name (Name) in Name_Image + | Name_Wide_Image + | Name_Wide_Wide_Image) then Array_Type := Get_Actual_Subtype (Name); -- 2.7.4