From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 744EF3839C51; Mon, 4 Jul 2022 07:51:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 744EF3839C51 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1444] [Ada] Refactor duplicated resolution of Count and Index attributes X-Act-Checkin: gcc X-Git-Author: Piotr Trojanek X-Git-Refname: refs/heads/master X-Git-Oldrev: a521dc37999bed5ec1f529b4c6ba7ded09dca464 X-Git-Newrev: e0cd23986ed4fcfbb71ab44959ca18299412e706 Message-Id: <20220704075144.744EF3839C51@sourceware.org> Date: Mon, 4 Jul 2022 07:51:44 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jul 2022 07:51:44 -0000 https://gcc.gnu.org/g:e0cd23986ed4fcfbb71ab44959ca18299412e706 commit r13-1444-ge0cd23986ed4fcfbb71ab44959ca18299412e706 Author: Piotr Trojanek Date: Tue May 31 12:22:21 2022 +0200 [Ada] Refactor duplicated resolution of Count and Index attributes Attribute Index, which was added to Ada 2022 by AI12-0143, is resolved just like attribute Count. However, code duplication rightly triggered a CodePeer warning. gcc/ada/ * sem_attr.adb (Resolve_Attribute): Refactor duplicated code for Count and Index attributes. Diff: --- gcc/ada/sem_attr.adb | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb index c0998a5be66..20849bf2088 100644 --- a/gcc/ada/sem_attr.adb +++ b/gcc/ada/sem_attr.adb @@ -12300,7 +12300,9 @@ package body Sem_Attr is -- if it is an element of an entry family, the index itself may -- have to be resolved because it can be a general expression. - when Attribute_Count => + when Attribute_Count + | Attribute_Index + => if Nkind (P) = N_Indexed_Component and then Is_Entity_Name (Prefix (P)) then @@ -12338,19 +12340,7 @@ package body Sem_Attr is -- Index -- ----------- - when Attribute_Index => - if Nkind (P) = N_Indexed_Component - and then Is_Entity_Name (Prefix (P)) - then - declare - Indx : constant Node_Id := First (Expressions (P)); - Fam : constant Entity_Id := Entity (Prefix (P)); - - begin - Resolve (Indx, Entry_Index_Type (Fam)); - Apply_Scalar_Range_Check (Indx, Entry_Index_Type (Fam)); - end; - end if; + -- Processing is shared with Count ---------------- -- Loop_Entry --