From patchwork Tue May 23 08:07:44 2023 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: 97833 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1973005vqo; Tue, 23 May 2023 01:10:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4oz7de9doz3XJ4DAOubVij5n81KEoL2OoXg89TTbC093lLbT81AGs+zqpvvWROpMT6lF6a X-Received: by 2002:a17:907:78da:b0:96b:559e:7f2f with SMTP id kv26-20020a17090778da00b0096b559e7f2fmr11760157ejc.38.1684829406821; Tue, 23 May 2023 01:10:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684829406; cv=none; d=google.com; s=arc-20160816; b=freMryW8yA1LmzpUeiTy3qVQ7EUYRL7W9ol1PiYCkIAfF8W7SKjjuQL94LHOIPTcfB oMccVC8AIWPZ7YEnrNhVsuh0y8ZEGhCGjdnDbc2nrrpimPCOWGsDFMTVPQ3mwHMjv+AF OiW09yDg8YqaAVJ0sRBEyvBV3IkCkmBe3nryHij5TGqVQBXKrv5Niuz2JVMMCyNRagzQ bQgZUJjNfzSh0PV7QrKyKZY5T13mKCH7dDxIAx1Nu9klxUyilEr5bmk3YG6lcD8CY3GD M3MBDvv1fhYXDtV+CzC0sklqclYgjRHhCOXnD4IJyDpZq5Z2MD4cwbjvqfhrsplCjCCZ tUXA== 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=ptSLhlLB17VTq2ctRKNsdZfZEQQwqkQ5rdRmal9m1GY=; b=rI5TjPgQp1y7kBZMwa3r0jQdfbsM5YQ4uXWiZ0OXD0zj1XGeflA7hbdi5bk8MzrBpa 2qkXWLlA9TLvtASfVtUIQTYcEB96MbeHv5jVDYZVOy5e501CdXLZxY3KnbttR0KwFFhg qJCAp/GVK1P9eTtWwk/aXdNW0m+KnUpGXaNw6W9sM3DtqAmARxcwfOl0XdkJXb9mW1ze q0wqwSd3b6195omve0X7S4X9znLSLZhSKmUJUZRv9vL86MtWk86seb13ll+dOIv9JEP4 SllLLPNTZlnZIP17GKVJ2D1nHj6+ZEJW9zsc1yMuHqlCPSt7BIYxBvtUngB7lzVHJO6d qF+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=T4d7KDn4; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id kf1-20020a17090776c100b009661752287dsi5314742ejc.219.2023.05.23.01.10.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 01:10:06 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=T4d7KDn4; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 CFDA33882172 for ; Tue, 23 May 2023 08:08:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CFDA33882172 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684829324; bh=ptSLhlLB17VTq2ctRKNsdZfZEQQwqkQ5rdRmal9m1GY=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=T4d7KDn4pUgDw9Uxy6MEb5bd/9rOwyGOe5BwRMohyVjpMbpqTiAA5AyRM1bTIjkKj nKrNGZ2w6+AmWC2VITmGPvuEaZmRkIujja1tE4zXsaGpb7BI7MlTR6hMBq6IM2ZcJ6 waUN/7sghjjdvgXRdhOIQ20slbJtNZ6hbsMHTwf0= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id D2B443857721 for ; Tue, 23 May 2023 08:07:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D2B443857721 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3f6042d605dso15161015e9.2 for ; Tue, 23 May 2023 01:07:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684829265; x=1687421265; 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=ptSLhlLB17VTq2ctRKNsdZfZEQQwqkQ5rdRmal9m1GY=; b=av5L4PeRzsjvBR4CBCRdtxYRxlYk9imVUSxaLSPiABhBI+O7q7C74d2Gt4uUGzezc+ UcQiQpDlg+KcBxYxnpIuKFUUve9+4XUz/Pwx4PhhBGqN4OOxuAd8MkI/C0YfAHiTV3Fq N3eWW9MYo3lX5OE+JKcvauofQ8nGRcw+fS5ghgd6JMzKRBmHnqzpXhokv5j8mOKm+7Nw xNwcn+lNU7Sa03z/5HfR/Pk/rxYmf37ehkQmNA0VAuZfJc0F2nbXlFCWcCrTUupPnHVz 8DmOgTaBOpqntIWPtfcyvQH2wmeeYb7O21DE59rPXqZvwbdTElc3hq4ew0lmqCUpFX8C 5oxQ== X-Gm-Message-State: AC+VfDxy3i/U1JEBjbSQdf15fbaT26pbIr7dSkZm8vFWK6cCFZwLif7g JPcsJXjvZhJNGyhMcZoYRvPhzQ1uTeaeIUNOt4S/Ag== X-Received: by 2002:a7b:c412:0:b0:3f4:2267:10cf with SMTP id k18-20020a7bc412000000b003f4226710cfmr9334871wmi.32.1684829265704; Tue, 23 May 2023 01:07:45 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id y21-20020a7bcd95000000b003f4e8530696sm10749868wmj.46.2023.05.23.01.07.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 01:07:45 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED] ada: Small code cleanup Date: Tue, 23 May 2023 10:07:44 +0200 Message-Id: <20230523080744.1872824-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 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, T_SCC_BODY_TEXT_LINE 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?1766671680154946633?= X-GMAIL-MSGID: =?utf-8?q?1766671680154946633?= From: Eric Botcazou This just merges two conditional blocks depending on the same condition. gcc/ada/ * frontend.adb (Frontend): Merge two conditional blocks and adjust. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/frontend.adb | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/gcc/ada/frontend.adb b/gcc/ada/frontend.adb index d964acd19f8..f2faa0960c6 100644 --- a/gcc/ada/frontend.adb +++ b/gcc/ada/frontend.adb @@ -426,24 +426,17 @@ begin -- Cleanup processing after completing main analysis - -- In GNATprove_Mode we do not perform most expansions but body - -- instantiation is needed. + pragma Assert (Operating_Mode in Check_Semantics | Generate_Code); - pragma Assert - (Operating_Mode = Generate_Code - or else Operating_Mode = Check_Semantics); + if Operating_Mode = Generate_Code or else GNATprove_Mode then + + -- In GNATprove_Mode we do not perform most expansions but body + -- instantiation is needed. - if Operating_Mode = Generate_Code - or else GNATprove_Mode - then Instantiate_Bodies; - end if; - -- Analyze all inlined bodies, check access-before-elaboration - -- rules, and remove ignored Ghost code when generating code or - -- compiling for GNATprove. + -- Analyze inlined bodies if required - if Operating_Mode = Generate_Code or else GNATprove_Mode then if Inline_Processing_Required then Analyze_Inlined_Bodies; end if; @@ -455,6 +448,8 @@ begin Collect_Garbage_Entities; end if; + -- Check access-before-elaboration rules + if Legacy_Elaboration_Checks then Check_Elab_Calls; end if;