From patchwork Mon Nov 7 08:40:11 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: 16309 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1920849wru; Mon, 7 Nov 2022 00:47:22 -0800 (PST) X-Google-Smtp-Source: AMsMyM5806hAUO3J1ack+/APFF6xyn0JW5pRLraRjDgPa9GGMLqqIAheQQFPlL4KeQDqhdSBwypF X-Received: by 2002:aa7:cf83:0:b0:463:1b7d:e318 with SMTP id z3-20020aa7cf83000000b004631b7de318mr43883677edx.4.1667810842389; Mon, 07 Nov 2022 00:47:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667810842; cv=none; d=google.com; s=arc-20160816; b=PsvgpcuSS5656B00eVvu3LociF8mORyNEoYoAfYkzwV6/2A6Pn0va30/lMtiHpU2iS wTTcFltIa6Ti1xf3BcbC94F71sCxZ+XdKJsqSwWZ5n/llqLiCJNYqyGj6/DeiGurVorn cEOxuoYM8fD2aE512CDOKzxSM+bqtDrxi7fWq1yb5+62parh7kGUOSJvmORpwQJ8ZjCT Mvq3ENanLABjUeDfOTcNPtpGDuNzw5FvedMXW+XNrMGjlX06zTBKMw66pufzfBRlrC0E X16d0EThVoQc3KDRPDLgIu6H/ac0wmgwwP4S9bqYMICydj8+psMEDfU7CPsPa7sem7UQ hnzg== 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=ZPe/yssNuCXOBN5lHMjbVgqAZRpfV0V5YjHq/LyJxT8=; b=yv2BLlnlzL43+poxLUaY8ikAh3CysAWH3oNPu4DIVuQ/Hx3VUoKGqjJTFQFJUhozUj 2Q3w/WA2FMNuQqDV3s/gzrdvkX/FZX+fjG05nhU2iUD/7vIAdps5/WHJRDZBpiRBRDV/ zS1SO/W1D4oUEBipQzyQrM+bjlWfIGi7NiMOaqq6bbRqJ/a9QqRqxBiEif2lWeQnHZzE 0zc7yiWGd36zki/tUh3jt96KNigPoyK8OW2+nLdj8LP19YICGK6bOv2rQ8/ctIf76NIF Tl+ABh7fHosWu82qloP2UIDW0RUb/u+wA1gXcLp0n6upKp6SPHCZjAOSlq0cf1enzF9e V6Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=KQgpug4G; 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 n10-20020a056402060a00b00461a3438b24si7641327edv.182.2022.11.07.00.47.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 00:47:22 -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=KQgpug4G; 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 6182F3854836 for ; Mon, 7 Nov 2022 08:43:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6182F3854836 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667810612; bh=ZPe/yssNuCXOBN5lHMjbVgqAZRpfV0V5YjHq/LyJxT8=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=KQgpug4Gl8FqjEC8SPgkvw+g9EvNPn+9wav7FNghWYY+qzY5Yy8YSjyxcGkgrm8rZ tmfmnUEF3jE/TT2mEE90TA1a1T4r4+NXEZWppC6fLO7hZrO32ZcqLeCuUMeHf0GQPb e5FYDjx4FE8hVuZFn1Lh0YG+1ExQuEAz78HE1DZ4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id F1279385802B for ; Mon, 7 Nov 2022 08:40:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F1279385802B Received: by mail-wr1-x433.google.com with SMTP id g12so14995751wrs.10 for ; Mon, 07 Nov 2022 00:40:14 -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=ZPe/yssNuCXOBN5lHMjbVgqAZRpfV0V5YjHq/LyJxT8=; b=mK/f08vrxSXU+xvHrHcCsgYM74LIVbrXo4cXhEPP5dJbXzj9naBHHDMKvE1SGK5/ek DDgTlrU3xrfFpPvMzZL51ykpQ6rdUc6oIEm/T/MhN8ODylsmrYUUEMheJaCa4pi+guHv O2MKJHR1Rd0z6/b3NmARvc1X3juOir95y1UQ+59b5THurm7G/23UyoxE0EljQp7Zyhlb 2xZmbxAEHf9PVqlzxBYHJkD7cNs6hmkprr0+LK2mtjq3byTmvwBeakW6XMd7Nhd4EjNb ebaRp+5jpNhmw9YIFHOV9NshvqV4+XQnK/pwOHPkkR5ompwtSnXQQ0FvhgBOlYfgrRZD 7vgg== X-Gm-Message-State: ACrzQf2oMdl+kgjhyuR/Aw2NHuFexv6AcYd4p7HFXGMgkR3fDO2Nk/Cu GqSdsgQMsAUmGo9YdgZwwBU4MKNKvqlXFQ== X-Received: by 2002:adf:eacd:0:b0:236:bd21:42d with SMTP id o13-20020adfeacd000000b00236bd21042dmr26554041wrn.242.1667810413863; Mon, 07 Nov 2022 00:40:13 -0800 (PST) Received: from poulhies-Precision-5550.lan (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id f17-20020a056000129100b002368a6deaf8sm6599141wrx.57.2022.11.07.00.40.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 00:40:13 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Allow reuse of Enclosing_Declaration_Or_Statement by GNATprove Date: Mon, 7 Nov 2022 09:40:11 +0100 Message-Id: <20221107084011.150984-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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, KAM_ASCII_DIVIDERS, 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?1748826421995341370?= X-GMAIL-MSGID: =?utf-8?q?1748826421995341370?= From: Piotr Trojanek Move routine Enclosing_Declaration_Or_Statement from body of Sem_Res to spec of Sem_Util, so it can be reused. In particular, GNATprove needs this functionality to climb from an arbitrary subexpression with target_name (@) to the enclosing assignment statement. Behaviour of the compiler is unaffected. gcc/ada/ * sem_res.adb (Enclosing_Declaration_Or_Statement): Moved to Sem_Util. * sem_util.ads (Enclosing_Declaration_Or_Statement): Moved from Sem_Res. * sem_util.adb (Enclosing_Declaration_Or_Statement): Likewise. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_res.adb | 31 ------------------------------- gcc/ada/sem_util.adb | 27 +++++++++++++++++++++++++++ gcc/ada/sem_util.ads | 4 ++++ 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index ea9a03b58e6..402da430b2f 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -895,10 +895,6 @@ package body Sem_Res is ------------------------------ function Check_Infinite_Recursion (Call : Node_Id) return Boolean is - function Enclosing_Declaration_Or_Statement (N : Node_Id) return Node_Id; - -- Return the nearest enclosing declaration or statement that houses - -- arbitrary node N. - function Invoked_With_Different_Arguments (N : Node_Id) return Boolean; -- Determine whether call N invokes the related enclosing subprogram -- with actuals that differ from the subprogram's formals. @@ -934,33 +930,6 @@ package body Sem_Res is -- Determine whether arbitrary node N appears within a conditional -- construct. - ---------------------------------------- - -- Enclosing_Declaration_Or_Statement -- - ---------------------------------------- - - function Enclosing_Declaration_Or_Statement - (N : Node_Id) return Node_Id - is - Par : Node_Id; - - begin - Par := N; - while Present (Par) loop - if Is_Declaration (Par) or else Is_Statement (Par) then - return Par; - - -- Prevent the search from going too far - - elsif Is_Body_Or_Package_Declaration (Par) then - exit; - end if; - - Par := Parent (Par); - end loop; - - return N; - end Enclosing_Declaration_Or_Statement; - -------------------------------------- -- Invoked_With_Different_Arguments -- -------------------------------------- diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 5c495761df1..5965fa1fbb7 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -8271,6 +8271,33 @@ package body Sem_Util is return Decl; end Enclosing_Declaration; + ---------------------------------------- + -- Enclosing_Declaration_Or_Statement -- + ---------------------------------------- + + function Enclosing_Declaration_Or_Statement + (N : Node_Id) return Node_Id + is + Par : Node_Id; + + begin + Par := N; + while Present (Par) loop + if Is_Declaration (Par) or else Is_Statement (Par) then + return Par; + + -- Prevent the search from going too far + + elsif Is_Body_Or_Package_Declaration (Par) then + exit; + end if; + + Par := Parent (Par); + end loop; + + return N; + end Enclosing_Declaration_Or_Statement; + ---------------------------- -- Enclosing_Generic_Body -- ---------------------------- diff --git a/gcc/ada/sem_util.ads b/gcc/ada/sem_util.ads index 88bfbfc2086..5c08cb8b9ab 100644 --- a/gcc/ada/sem_util.ads +++ b/gcc/ada/sem_util.ads @@ -809,6 +809,10 @@ package Sem_Util is -- Returns the declaration node enclosing N (including possibly N itself), -- if any, or Empty otherwise. + function Enclosing_Declaration_Or_Statement (N : Node_Id) return Node_Id; + -- Return the nearest enclosing declaration or statement that houses + -- arbitrary node N. + function Enclosing_Generic_Body (N : Node_Id) return Node_Id; -- Returns the Node_Id associated with the innermost enclosing generic -- body, if any. If none, then returns Empty.