From patchwork Thu May 25 08:05:19 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: 98839 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp192699vqr; Thu, 25 May 2023 01:07:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7cueL3j87G6RPIKqdpCTVRKpL7lHQiopM1d7drDcojLh5IwLIz+nugtKtAu7dgOZ7TC12F X-Received: by 2002:aa7:c3ca:0:b0:50d:f881:1afc with SMTP id l10-20020aa7c3ca000000b0050df8811afcmr3631059edr.23.1685002049153; Thu, 25 May 2023 01:07:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685002049; cv=none; d=google.com; s=arc-20160816; b=yQjDkIe+UJx09Vvy8heZVTCTr50GQFTVTb5yDnHzAVFMwGM2mgiOHO4CeOOR2o07ZE Jv/pVDyoSJKZXSk/1LR0c5/wuS63camC4DSDWku2K5X4AnMhSL+AvKLc0BjuVcfU3+Sr S6Hvj8fQma6LGZn2PWXKUxRWL/FHUvfJDB6nMexupHrlEYyAC07md3PKGS0FUolRrJZb wpVwnrx/hDvYpGpHBRUyhJzGybCgz/gqoMy1NiJDQx0QLbMh/ieyQfaUMoXQ0C5b3GdA gyGHrGHSO8IajKkkxhllTxLsohEoyJR/mZmzBhJduseQwVYfbftnDatSl8z/07V1eRin yxCA== 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=Vu7K9GnDlEYaX+3XwtgKgTCdAMuqiEm2wl2cktzyfxI=; b=aoa47DV0r3rcyCmQXin83M5FGEG8VwnQ7zrPcOFY6YpUiongtksFyyJiyukkRTOMuI AeHyRR4iLwzigkpi0aqVpYD0oT30KJN/cGbiIv9Sa3vR3vtoueiOIxuIwdWeyEf7s8fK EDb/REsCaIPDlk3DdAFU9PU1IOWgmRlYUalBGnrlmFnN4mtg2pjVKE+qmR6ztBpuwh4H RTzi1/YSq2sw4LUBUZR383riEATszqm8jiMmCi7lRO4k9kKERAr3z8Gq5e9EECip/N13 3DyqI9alIovVxOg9ad0qIOnZ+kGyy7S1n+mHzOKnP7h+qfRKTMyfsfdYMup6YtZc0j6W B3EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=ZJ9eI9y4; 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 (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id f5-20020a50ee85000000b0050ca8ca3250si89083edr.418.2023.05.25.01.07.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 01:07:29 -0700 (PDT) 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=ZJ9eI9y4; 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 01B20385700C for ; Thu, 25 May 2023 08:06:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 01B20385700C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685001993; bh=Vu7K9GnDlEYaX+3XwtgKgTCdAMuqiEm2wl2cktzyfxI=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=ZJ9eI9y4yshEn13gLUb5KRC2icwuIstLFoXXbc5h2QGjfq9Q69enf9KclyFpf2+TR zl1YZ85hcIB6ZbAxdWliRtSFnrDCH4V4+GpHnmSJvothAi/OPn4ELIBrNjdIyRr5Cc 5g9N302Ju75j+ytJk7vCO/UbhFScF2JN0v3wtCb0= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by sourceware.org (Postfix) with ESMTPS id 7B7583858CDB for ; Thu, 25 May 2023 08:05:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7B7583858CDB Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3078d1c8828so1722040f8f.3 for ; Thu, 25 May 2023 01:05:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685001920; x=1687593920; 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=Vu7K9GnDlEYaX+3XwtgKgTCdAMuqiEm2wl2cktzyfxI=; b=Cp0n1mHAMu8akuPATjl+dlmWCV9XdDet9HeXq5lZ3OzXDnjAIdZ+XqEkSx+L07mmId xmHhxjgTZKljKS9T1/ilDSWGMRqiP5VVQJJ2EE6Fy4hCPsdq0mg4UmI+QysF4+zC/pfC joTPXMBsFRImJqvgUm9xmfVysnTlEY9rPGy66VSfXFuhSQROAg0OvENcjTD865gxF367 a18W2+HMAvAjcoTdOam6g0qyxYgLLr1GlRPGQhvOQ/BXID4+NOQENr2Is6roCHp4kCpv aP8pp/N7C3w0E4NNJbaH5+mDNJVxSVzTqgjgzYDTs9e8c5ThqOMA1ZotMx8/tA/kbxIV Vlpw== X-Gm-Message-State: AC+VfDzU/tn9OXmkncPaQTnQ/PSgOmSAlzc0XCGNhALyNDCkeX5Wcszs pQmp2pomjs0IdxouFN2SM9e3RxaC0vSW3RN7uexGGA== X-Received: by 2002:a05:6000:88a:b0:2fe:851c:672f with SMTP id cs10-20020a056000088a00b002fe851c672fmr1875955wrb.8.1685001920542; Thu, 25 May 2023 01:05:20 -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 t7-20020adfe107000000b002fe96f0b3acsm869731wrz.63.2023.05.25.01.05.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 01:05:20 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: =?utf-8?q?Marc_Poulhi=C3=A8s?= Subject: [COMMITTED] ada: Fix SPARK context not restored when Load_Unit is failing Date: Thu, 25 May 2023 10:05:19 +0200 Message-Id: <20230525080519.1955422-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.2 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, 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?1766852708590793581?= X-GMAIL-MSGID: =?utf-8?q?1766852708590793581?= When Load_Unit fails to find the unit or encounters an error, the Load_Fail procedure is called and an exception is raised, skipping the restoration of the SPARK/Ghost context stored on procedure entry. gcc/ada/ * rtsfind.adb (Load_RTU.Restore_SPARK_Context): New. (Load_RTU): Use Restore_SPARK_Context on all exit paths. * sem_ch6.adb (Analyze_Subprogram_Body_Helper): Initialize local variable to Empty. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/rtsfind.adb | 41 ++++++++++++++++++++++++++++++----------- gcc/ada/sem_ch6.adb | 2 +- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/gcc/ada/rtsfind.adb b/gcc/ada/rtsfind.adb index 4b8e89e213f..278797ff491 100644 --- a/gcc/ada/rtsfind.adb +++ b/gcc/ada/rtsfind.adb @@ -1023,6 +1023,13 @@ package body Rtsfind is U : RT_Unit_Table_Record renames RT_Unit_Table (U_Id); Priv_Par : constant Elist_Id := New_Elmt_List; Lib_Unit : Node_Id; + Saved_GM : constant Ghost_Mode_Type := Ghost_Mode; + Saved_IGR : constant Node_Id := Ignored_Ghost_Region; + Saved_ISMP : constant Boolean := + Ignore_SPARK_Mode_Pragmas_In_Instance; + Saved_SM : constant SPARK_Mode_Type := SPARK_Mode; + Saved_SMP : constant Node_Id := SPARK_Mode_Pragma; + -- Save Ghost and SPARK mode-related data to restore on exit procedure Save_Private_Visibility; -- If the current unit is the body of child unit or the spec of a @@ -1034,6 +1041,9 @@ package body Rtsfind is procedure Restore_Private_Visibility; -- Restore the visibility of ancestors after compiling RTU + procedure Restore_SPARK_Context; + -- Restore Ghost and SPARK mode-related data saved on procedure entry + -------------------------------- -- Restore_Private_Visibility -- -------------------------------- @@ -1075,15 +1085,16 @@ package body Rtsfind is end loop; end Save_Private_Visibility; - -- Local variables + --------------------------- + -- Restore_SPARK_Context -- + --------------------------- - Saved_GM : constant Ghost_Mode_Type := Ghost_Mode; - Saved_IGR : constant Node_Id := Ignored_Ghost_Region; - Saved_ISMP : constant Boolean := - Ignore_SPARK_Mode_Pragmas_In_Instance; - Saved_SM : constant SPARK_Mode_Type := SPARK_Mode; - Saved_SMP : constant Node_Id := SPARK_Mode_Pragma; - -- Save Ghost and SPARK mode-related data to restore on exit + procedure Restore_SPARK_Context is + begin + Ignore_SPARK_Mode_Pragmas_In_Instance := Saved_ISMP; + Restore_Ghost_Region (Saved_GM, Saved_IGR); + Restore_SPARK_Mode (Saved_SM, Saved_SMP); + end Restore_SPARK_Context; -- Start of processing for Load_RTU @@ -1195,9 +1206,17 @@ package body Rtsfind is Set_Is_Potentially_Use_Visible (U.Entity, True); end if; - Ignore_SPARK_Mode_Pragmas_In_Instance := Saved_ISMP; - Restore_Ghost_Region (Saved_GM, Saved_IGR); - Restore_SPARK_Mode (Saved_SM, Saved_SMP); + Restore_SPARK_Context; + + exception + -- The Load_Fail procedure that is called when the result of Load_Unit + -- is not satisfactory raises an exception. As the compiler is able to + -- recover in some cases (i.e. when RE_Not_Available is raised), we need + -- to restore the SPARK/Ghost context correctly. + + when others => + Restore_SPARK_Context; + raise; end Load_RTU; -------------------- diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index 992688cf092..48b363e077c 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -2277,7 +2277,7 @@ package body Sem_Ch6 is Mask_Types : Elist_Id := No_Elist; Prot_Typ : Entity_Id := Empty; Spec_Decl : Node_Id := Empty; - Spec_Id : Entity_Id; + Spec_Id : Entity_Id := Empty; Last_Real_Spec_Entity : Entity_Id := Empty; -- When we analyze a separate spec, the entity chain ends up containing