From patchwork Fri May 26 07:36:16 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: 70133 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 4C77F3954C7A for ; Fri, 26 May 2023 07:41:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4C77F3954C7A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685086872; bh=5dJe1cU38sFGfOGgVH7vXSrsVH08OKWT7+ARePnnXHk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=BDyE8NTdINfaPpqGt4xyvxtbY2U0+3pOR/qNfsK4hoImWD9IHw2LMFOcEIxMZsE9U RjPkGU43Jt0rWyLAVtJbvG2Ib6z/HdgTzCiK4rCqrzTTEg10CabvOHYjo6xkU6QDhg UI2COMfGh/OTzmRWxELy0EuZ0v2ywKmr4d7mqdao= 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 6AD30383906C for ; Fri, 26 May 2023 07:36:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6AD30383906C Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3f6da07feb2so4960575e9.0 for ; Fri, 26 May 2023 00:36:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685086578; x=1687678578; 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=5dJe1cU38sFGfOGgVH7vXSrsVH08OKWT7+ARePnnXHk=; b=N76oKpvsW57TTEF4qAIZEWg8M4qWm+m+VuGQZ9WpkVlh/XSiPd38cQXEXrP0KQJyoq QnQ5f2AmVxICRHro3KjMb8z8hKWLC2NEue72YsYlzMGdxQsIwCqu9r/RtkLJQGSMMVqW Q2vjfC+QUvrkU/L9zVwfn5gM5Tm+sVtEO4z/oLm6TD5040CQY15RrFDe5KrozmP0UF+X zD8UXGncTAmOsGHLUx4HU6QEB/w1sH/h9W6yAOMC3M9ZM1FfNR389ac7eBtdGm1XdiSH AHI7nZcz4fOwxvZ3PghcPot41GPEHy/1oqwDs1sWnLEcil4511pGGvytn6jAHN9MWahm RdKQ== X-Gm-Message-State: AC+VfDwXDT7C9i38YXia+iU50/CLdQlImqrzD0ZIzQ5trtWKhEj+rdWP 5qMtycwhL88jRfCQE1Mr6BW3P2PkV0VSk/VRYjdsuw== X-Google-Smtp-Source: ACHHUZ625SgatwON/osLr688YO8zuTh4m1rG3SCAeo4uoaMlYe7BbLnlRpb3D3bPdvdTwklphpDZLQ== X-Received: by 2002:a7b:c7ce:0:b0:3f6:41d:24d2 with SMTP id z14-20020a7bc7ce000000b003f6041d24d2mr672564wmk.39.1685086578375; Fri, 26 May 2023 00:36:18 -0700 (PDT) Received: from localhost.localdomain ([2001:861:3382:1a90:777b:eef4:6f79:f26f]) by smtp.gmail.com with ESMTPSA id a15-20020a5d508f000000b002ceacff44c7sm4093603wrt.83.2023.05.26.00.36.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 00:36:17 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Tune detection of expression functions within a declare expression Date: Fri, 26 May 2023 09:36:16 +0200 Message-Id: <20230526073616.2068819-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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" From: Piotr Trojanek Code cleanup; semantics is unaffected. gcc/ada/ * sem_ch4.adb (Check_Action_OK): Replace low-level test with a high-level routine. * sem_ch13.adb (Is_Predicate_Static): Likewise. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_ch13.adb | 2 +- gcc/ada/sem_ch4.adb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index b13af26b561..958b26ebb0d 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -14261,7 +14261,7 @@ package body Sem_Ch13 is -- transformed into just "(S /= 0)", which would appear to be -- a predicate-static expression (and therefore legal). - if Original_Node (Expr) /= Expr then + if Is_Rewrite_Substitution (Expr) then -- Emit warnings for predicates that are always True or always False -- and were not originally expressed as Boolean literals. diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index a85c988fe46..c8bb99b6716 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -2371,11 +2371,11 @@ package body Sem_Ch4 is if not Comes_From_Source (N) or else not Comes_From_Source (A) then -- If, for example, an (illegal) expression function is - -- transformed into a"vanilla" function then we don't want to + -- transformed into a "vanilla" function then we don't want to -- allow it just because Comes_From_Source is now False. So look -- at the Original_Node. - if A /= Original_Node (A) then + if Is_Rewrite_Substitution (A) then Check_Action_OK (Original_Node (A)); end if;