From patchwork Tue Nov 9 09:46:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 47257 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 967C4385801F for ; Tue, 9 Nov 2021 10:01:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 967C4385801F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1636452111; bh=8CedUyt256YB0CCM9c8X4fr5OZ9BYYsL9UVCn+e/G8M=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=rBY+JlzWZ9frv8uP01Aw+pdwAqD40rUNNlUHgngzIfKCOD47p4Rr4CIIM1++Q35ZY qACgd1wjuMkMXlcKOeLj3JuTew7rrvRJ43ruHD/e88+JYX+RHPmufd4HGD2eKUSS+G 0MDsg9aMKF2oz/5cDAsErrR8ir1dHr5AkRO0+NrU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by sourceware.org (Postfix) with ESMTPS id A5C273858C2C for ; Tue, 9 Nov 2021 09:46:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A5C273858C2C Received: by mail-lj1-x232.google.com with SMTP id s24so35118870lji.12 for ; Tue, 09 Nov 2021 01:46:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=8CedUyt256YB0CCM9c8X4fr5OZ9BYYsL9UVCn+e/G8M=; b=kv4dcunVzJKjE1Xo6Nqjj2MSt7ckx6yCVB9PvXcnj84kfPaBQKhRuxX3m2J4HHmYvO 8hhRDktt8Aw5EtBGzdrgH06k/wC5qrawB7Z968pECSYsgYEsg9npw0xvIJA1KntozSBg o45VWGqnYYntLNF8Lb5eP1KwSIPOUVmqMl4K6oebQCWAI8QTLyHvE+JbP/GyO+vsgPVl CPANfhpchWr47apukp6/oklqR67mdkpw52N/+224C5nS9nhy37bKiZMp4Kle8RP9+qr5 fFHmYIIsOewKsk5Eln3aghKbkXSBhorTWoO+mXKJ7uKKn+l9qAucG/0E8Tz6mKuEr0HB ecYw== X-Gm-Message-State: AOAM532tb18mcWhMnjkJWVLBJpPv7mWop0BrrUXljHsASwgs22paxmEs 1YmvA937hj2evbheJ5wHWJ6XPyRnkeQWOQ== X-Google-Smtp-Source: ABdhPJzcSApX5nPbSk7WluGfB1It5I+rMspeGYJyXPBdLmnaxFTJMmSxOOWOFaOyQQOW6j6tDaBm5w== X-Received: by 2002:a2e:8584:: with SMTP id b4mr6218666lji.14.1636451168551; Tue, 09 Nov 2021 01:46:08 -0800 (PST) Received: from adacore.com ([2a02:2ab8:224:2ce:72b5:e8ff:feef:ee60]) by smtp.gmail.com with ESMTPSA id l19sm904011lji.27.2021.11.09.01.46.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 01:46:07 -0800 (PST) Date: Tue, 9 Nov 2021 09:46:06 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Cleanup copying of parameter lists Message-ID: <20211109094606.GA830515@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.0 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Piotr Trojanek Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Cleanup related to expansion of predefined equality for GNATprove; semantics is unaffected. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * sem_util.adb (Copy_Parameter_List): Refactor to remove repeated calls to First_Formal. diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -6797,14 +6797,11 @@ package body Sem_Util is function Copy_Parameter_List (Subp_Id : Entity_Id) return List_Id is Loc : constant Source_Ptr := Sloc (Subp_Id); Plist : List_Id; - Formal : Entity_Id; + Formal : Entity_Id := First_Formal (Subp_Id); begin - if No (First_Formal (Subp_Id)) then - return No_List; - else - Plist := New_List; - Formal := First_Formal (Subp_Id); + if Present (Formal) then + Plist := New_List; while Present (Formal) loop Append_To (Plist, Make_Parameter_Specification (Loc, @@ -6819,6 +6816,8 @@ package body Sem_Util is Next_Formal (Formal); end loop; + else + Plist := No_List; end if; return Plist;