From patchwork Tue Nov 8 08:43:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 16954 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2574926wru; Tue, 8 Nov 2022 00:57:48 -0800 (PST) X-Google-Smtp-Source: AMsMyM7iENLKEvypHMnif/NVk0WtKJ9AoLarLxr8+9+gqrewhsRxw+KGTVqb+LAPOpX9t/6wa/qv X-Received: by 2002:a17:907:3f25:b0:7ae:319c:90b2 with SMTP id hq37-20020a1709073f2500b007ae319c90b2mr20982575ejc.515.1667897868809; Tue, 08 Nov 2022 00:57:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667897868; cv=none; d=google.com; s=arc-20160816; b=ABdFaDS8rTsJrX1mrUFUqagDWstXNtx2WKxNJF2LcC2i831xll+tlyY9oEOPRMIsKD 71PEVBNDl7Ls3fjKhN6glkS2jYfrRc0xCtCgBMR73JfoPfLltIRA+qq0rhso6aoJvZ7v wLTD+wwvGxtwng+YdtHb/V4+L1T7wRWDZU9/B4YXvtFcLWnqCzrc8/oFqPo1YZmhG77a vwly9a7rn14vumIwSNoHv/9xqS0d7rzh88/Qiem54h77gJrKAEsNrlQDj5LY9H4nStQX TIw6kOXsqUxZlEBXrb5YZfvzOHVLkE9SIRvrOfxE7H6mXtuT9mD2icbc+aJKl+tn3DI6 hF6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=i0i7crGJGbiqPs6MNDtkK2dfyairmvbC9Jna851kBMM=; b=IqawtPRr8R+KCiRz+w6+eaiyY4ddz569Y/LcFjkGV9GYwLYUBQO8SvCoef8huRc2iH +aq/ugQvZUIRZ/MS0os5PzYwRTZ0I8o2j0pXzCuKbQ+oN7xiGJHAWTXbPF4BcwIysmcm ona9fSzqyThc+U/jGi+9mwr3Ju1L74mrIypVC1Qo52uXAFLUYANFlOcj72Aa5FCsCPtR enP69WwnABh16I9l84B+I6M2eLB4BRidLZGljsuyAQ3lcmVu97xe/zciBk2jIOfsk+DU kZTsARDZhICFIv0/5fxx4CnCqATj8gce45AFMiTTZW8ChGAHmV7Ac4Fl/QMgvIj4NHMI b3Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="ROhmpB/1"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id cy1-20020a0564021c8100b00459060fcde3si10879782edb.202.2022.11.08.00.57.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Nov 2022 00:57:48 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="ROhmpB/1"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 03613385DC17 for ; Tue, 8 Nov 2022 08:52:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 03613385DC17 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667897548; bh=i0i7crGJGbiqPs6MNDtkK2dfyairmvbC9Jna851kBMM=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=ROhmpB/1SCLn6+yGmcgIBfuUA0TtVu/z3zu+ArmO2U83jGnG6tTRI6jz8qSRBaa/7 mWB5YVsEd0Awu46m+SiRQhJjSiNTHVROFZelOmjtkLIN6nsuUwoMl7cVUtzNKF8mdb YLOjghGI1i4+GFWNa6TXx0JgH9rWNKlsfKxN/amY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id CDCE0385737D for ; Tue, 8 Nov 2022 08:43:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CDCE0385737D Received: by mail-wr1-x42d.google.com with SMTP id bs21so19807512wrb.4 for ; Tue, 08 Nov 2022 00:43:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=i0i7crGJGbiqPs6MNDtkK2dfyairmvbC9Jna851kBMM=; b=fY1GoQAVQZWK3QVYBmg1N7VUQ7+mzuSviqFXus+3Op6Di/fcto1kE4HDg7PSXCAidO hRfhgxSaoH4L+RvgcitmLSSd+BH2lz19kDIzEzEg43OWSeFMzjGmnAayZyvbMUf+yUGx 1+b8VUuAStriDiU8r3tjdqxCMjF+nyUXbRHPbdPjMTqsNch9zgiqDFW6IFpktTAaQ2Hd FE7x/VVWL8lgtoTh4grQNyzWEW3pXvfPZfAp24PZAgsFw3zlkm+2OxdXR35lkUiLawOE oSoZCAW8NnhcTmN++o6Kn5zZC+8Vv9WYb8prtpTe5ww2muc+h8JDqp4BsKo0UtOyd5zm Ziuw== X-Gm-Message-State: ACrzQf0s5YDRsg/ib6GiCH+6v5ZLXEXK8T0AcY8cQTDJP5aJkNqOvKo1 vsnUMlahA2J71CBTY+XjYJvtL9pF71PQvg== X-Received: by 2002:a5d:6a81:0:b0:236:65a0:e7d9 with SMTP id s1-20020a5d6a81000000b0023665a0e7d9mr34558750wru.327.1667897033734; Tue, 08 Nov 2022 00:43:53 -0800 (PST) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id m12-20020a5d6a0c000000b00238df11940fsm9683891wru.16.2022.11.08.00.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Nov 2022 00:43:53 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Clean up call to check if aspects are present Date: Tue, 8 Nov 2022 09:43:50 +0100 Message-Id: <20221108084350.302166-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748917676039687651?= X-GMAIL-MSGID: =?utf-8?q?1748917676039687651?= From: Piotr Trojanek Code cleanup; semantics is unaffected. gcc/ada/ * exp_ch6.adb, exp_put_image.adb, sem_aggr.adb, sem_attr.adb, sem_ch5.adb, sem_type.adb, sem_util.adb: Replace "Present (Find_Aspect (...))" with "Has_Aspect". Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/exp_ch6.adb | 4 ++-- gcc/ada/exp_put_image.adb | 2 +- gcc/ada/sem_aggr.adb | 2 +- gcc/ada/sem_attr.adb | 4 ++-- gcc/ada/sem_ch5.adb | 2 +- gcc/ada/sem_type.adb | 2 +- gcc/ada/sem_util.adb | 14 ++++++-------- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index fce7a7cebf5..1466e4dc36a 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -3305,8 +3305,8 @@ package body Exp_Ch6 is or else No (Aspect) -- Do not fold if multiple applicable predicate aspects - or else Present (Find_Aspect (Subt, Aspect_Static_Predicate)) - or else Present (Find_Aspect (Subt, Aspect_Predicate)) + or else Has_Aspect (Subt, Aspect_Static_Predicate) + or else Has_Aspect (Subt, Aspect_Predicate) or else Augments_Other_Dynamic_Predicate (Aspect) or else CodePeer_Mode then diff --git a/gcc/ada/exp_put_image.adb b/gcc/ada/exp_put_image.adb index f90f0206f27..eaedebe4001 100644 --- a/gcc/ada/exp_put_image.adb +++ b/gcc/ada/exp_put_image.adb @@ -1045,7 +1045,7 @@ package body Exp_Put_Image is declare U_Type : constant Entity_Id := Underlying_Type (Entity (Prefix (N))); begin - if Present (Find_Aspect (U_Type, Aspect_Put_Image)) then + if Has_Aspect (U_Type, Aspect_Put_Image) then return True; end if; diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index 4da05dd7317..3a093d26007 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -1052,7 +1052,7 @@ package body Sem_Aggr is elsif Is_Array_Type (Typ) and then Null_Record_Present (N) then Error_Msg_N ("null record forbidden in array aggregate", N); - elsif Present (Find_Aspect (Typ, Aspect_Aggregate)) + elsif Has_Aspect (Typ, Aspect_Aggregate) and then Ekind (Typ) /= E_Record_Type and then Ada_Version >= Ada_2022 then diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb index 299ea04959c..de4e8aa681c 100644 --- a/gcc/ada/sem_attr.adb +++ b/gcc/ada/sem_attr.adb @@ -5996,8 +5996,8 @@ package body Sem_Attr is -- Verify that prefix can be iterated upon. if Is_Array_Type (Typ) - or else Present (Find_Aspect (Typ, Aspect_Default_Iterator)) - or else Present (Find_Aspect (Typ, Aspect_Iterable)) + or else Has_Aspect (Typ, Aspect_Default_Iterator) + or else Has_Aspect (Typ, Aspect_Iterable) then null; else diff --git a/gcc/ada/sem_ch5.adb b/gcc/ada/sem_ch5.adb index 5f0629d32b3..7bca6d39dd2 100644 --- a/gcc/ada/sem_ch5.adb +++ b/gcc/ada/sem_ch5.adb @@ -2191,7 +2191,7 @@ package body Sem_Ch5 is if Is_Array_Type (Typ) or else Is_Reversible_Iterator (Typ) or else - (Present (Find_Aspect (Typ, Aspect_Iterable)) + (Has_Aspect (Typ, Aspect_Iterable) and then Present (Get_Iterable_Type_Primitive (Typ, Name_Previous))) diff --git a/gcc/ada/sem_type.adb b/gcc/ada/sem_type.adb index 2fc82d14016..718c29754c1 100644 --- a/gcc/ada/sem_type.adb +++ b/gcc/ada/sem_type.adb @@ -1007,7 +1007,7 @@ package body Sem_Type is elsif Ada_Version >= Ada_2022 and then T2 = Any_Composite - and then Present (Find_Aspect (T1, Aspect_Aggregate)) + and then Has_Aspect (T1, Aspect_Aggregate) then return True; diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 71548dcca17..e43581ec6e9 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -13309,7 +13309,7 @@ package body Sem_Util is begin return Nkind (Exp) = N_Aggregate - and then Present (Find_Aspect (Etype (Exp), Aspect_Aggregate)) + and then Has_Aspect (Etype (Exp), Aspect_Aggregate) and then not Is_Record_Aggregate; end Is_Container_Aggregate; @@ -21718,18 +21718,16 @@ package body Sem_Util is -- type has the appropriate user-defined literal aspect. return (Nkind (N) in N_Numeric_Or_String_Literal - and then Present (Find_Aspect (Typ, Literal_Aspect_Map (Nkind (N))))) + and then Has_Aspect (Typ, Literal_Aspect_Map (Nkind (N)))) or else (Is_Entity_Name (N) and then Present (Entity (N)) and then ((Ekind (Entity (N)) = E_Named_Integer - and then - Present (Find_Aspect (Typ, Aspect_Integer_Literal))) + and then Has_Aspect (Typ, Aspect_Integer_Literal)) or else (Ekind (Entity (N)) = E_Named_Real - and then - Present (Find_Aspect (Typ, Aspect_Real_Literal))))); + and then Has_Aspect (Typ, Aspect_Real_Literal)))); end Is_User_Defined_Literal; -------------------------------------- @@ -32563,7 +32561,7 @@ package body Sem_Util is (Typ : Entity_Id) return Boolean is begin - return Present (Find_Aspect (Typ, Aspect_Designated_Storage_Model)); + return Has_Aspect (Typ, Aspect_Designated_Storage_Model); end Has_Designated_Storage_Model_Aspect; ----------------------------------- @@ -32573,7 +32571,7 @@ package body Sem_Util is function Has_Storage_Model_Type_Aspect (Typ : Entity_Id) return Boolean is begin - return Present (Find_Aspect (Typ, Aspect_Storage_Model_Type)); + return Has_Aspect (Typ, Aspect_Storage_Model_Type); end Has_Storage_Model_Type_Aspect; --------------------------