From patchwork Tue Jun 20 07:46:50 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: 110302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3495855vqr; Tue, 20 Jun 2023 00:52:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6bXl/528oRt/Q6zuBANDPC3/4OhCn2HRhWcQeCwE5LZ5IoXxvH7Oqh46+0XDmRKp2QQ7hN X-Received: by 2002:a17:907:1c2a:b0:988:84a9:bd64 with SMTP id nc42-20020a1709071c2a00b0098884a9bd64mr4779894ejc.0.1687247571148; Tue, 20 Jun 2023 00:52:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687247571; cv=none; d=google.com; s=arc-20160816; b=VhXTlo/6KYvuxHf+xjvaHnfIxxDYEKLADFkJbKxqOdGa6+eqKx39H4MWyu2YwEov/P Rm4OuuHxmKhM36+vf8Yke9FgyLD2mGlLM61JanXFYfLkrB5uah89vP6TlXBldfFL4tzo 9/Fen0sBvNPP+tWSEWsSCL0Wz2DvNEVHCQB9gEM8x03OrT6BlWL4R6oputCrniX6pZ7G HrmepZkZWRQaZJEr2tH0fgBR/sI0YqYfhE+bGAYVZnKGv8dsUFPXjDp8xyUZ9C45BnYN DWS0wo3PpffIYD0L5u44T784WMPBQK6FJxg7ZBXxAETfbulUfcq4UWazX1zrwVp221fi p6XQ== 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=SRh5fwfh3KbqHO04csqAd4Oc/xqfc4eHTKhDbIxwfQs=; b=ccSzvy39WkgWSt2/TWC52NVEo+D6G1+weS9wPm5SmAfrgjeKfi2Ry2zGEiAVIPKYnb yZDax4CF554vqtAx1ZWGsnsiGybQDbrZnjSZ2TSAipprzF/jdhKNzF5KEc+SUshwt29R olbgbu7qhaPhxqHOnMWuH1vnZib7klN5u7yjmEgiP09/DQr3k/Wsd7RLgSVRdk+7TZS5 USpWDn76TrnJFf5aHO+BqtufMoRp5H/5R+Cz2+6UR3bLjk/UUuDLOYveyEh7UD3k1tZm sZftZ0p6Bilz0WpT70mAWO9Wj7Apq1Ce+shuJ7McSdecjC7orzSoK49yGqd5aOkqcCCC NeqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=WFILmnpX; 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 x16-20020a170906b09000b00987caa55379si857581ejy.547.2023.06.20.00.52.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 00:52:51 -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=WFILmnpX; 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 3C32C3827984 for ; Tue, 20 Jun 2023 07:49:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3C32C3827984 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687247368; bh=SRh5fwfh3KbqHO04csqAd4Oc/xqfc4eHTKhDbIxwfQs=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=WFILmnpXqZhvjikAEbMwwIoYzrCwqMv+OQFn8huKiwBBvmMIrYoVBXLFP5E6/Fmk/ yCIZOpD5vzE63xjQKr3ux+XGk09PEouMGvHLY/d+ewarhotBCJEFA3zEbE5Y8L9t4A V8scRF/IAeZ3+q9XlpsIPxvcD/LtLsA/wEKGsCV4= 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 2664D3857731 for ; Tue, 20 Jun 2023 07:46:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2664D3857731 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3112902f785so2537751f8f.0 for ; Tue, 20 Jun 2023 00:46:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687247212; x=1689839212; 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=SRh5fwfh3KbqHO04csqAd4Oc/xqfc4eHTKhDbIxwfQs=; b=bxs1yZgaG9BVHsE/MxHPzKaGJZlQ5oFJduBsAmd+dKrzPrsOKDwm/c5gVg/8CtWABz hZL/YbgItggolYgQDQFDdV6GC0QC2tHnE7tEDQOf/TREUlu9VypulScaMlhmp07dXAlD 1fiWUTx922oePT02JFuGAlYE0bbMPfeqWoOyQrZ24T69Hz+1DwqhnNNWppgscNa1SIPn Lqs3exUYhvrQMNW3TXPZHEH2F+m2r5PrBp5bN5MHlqm95mtYEBemNjHvI3lEs2S7O77Z vFL+PLw7XeXfl3aPZO/LgVBd+TARYXG/UuThXRf8wDFOyeetqlEsLF78JfWemN3Mm1xn T7gA== X-Gm-Message-State: AC+VfDxi8NhjzrX7ac/byIirzUxakJ5jMoB9ct2OlT/0SKa4hkIWiAr7 RA50L6AexJHinakiHD2q9C/UJv6lQR72AuWYMq0G9w== X-Received: by 2002:adf:f503:0:b0:311:ab6:1a8e with SMTP id q3-20020adff503000000b003110ab61a8emr9998848wro.9.1687247211891; Tue, 20 Jun 2023 00:46:51 -0700 (PDT) Received: from poulhies-Precision-5550.lan ([2001:861:3382:1a90:4c16:36ea:1b76:c001]) by smtp.gmail.com with ESMTPSA id s6-20020adfea86000000b0030ae3a6be5bsm1332581wrm.78.2023.06.20.00.46.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 00:46:51 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Yannick Moy Subject: [COMMITTED] ada: Update annotations in runtime for proof Date: Tue, 20 Jun 2023 09:46:50 +0200 Message-Id: <20230620074650.1252499-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 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?1769207309480536546?= X-GMAIL-MSGID: =?utf-8?q?1769207309480536546?= From: Yannick Moy With bump of stable SPARK used for proof of the runtime, some annotations need to change. gcc/ada/ * libgnat/s-aridou.adb (Scaled_Divide): Add assertions. * libgnat/s-valuti.adb: Add Loop_Variant. * libgnat/s-valuti.ads: Add Exceptional_Cases on No_Return procedure. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/libgnat/s-aridou.adb | 11 +++++++++++ gcc/ada/libgnat/s-valuti.adb | 2 ++ gcc/ada/libgnat/s-valuti.ads | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gcc/ada/libgnat/s-aridou.adb b/gcc/ada/libgnat/s-aridou.adb index 66ace8071ff..831590ce387 100644 --- a/gcc/ada/libgnat/s-aridou.adb +++ b/gcc/ada/libgnat/s-aridou.adb @@ -2580,8 +2580,19 @@ is pragma Assert (Big (Double_Uns (Hi (T2))) + Big (Double_Uns (Hi (T1))) = Big (Double_Uns (D (1)))); + pragma Assert + (Is_Mult_Decomposition (D1 => Big (Double_Uns (D (1))), + D2 => Big (Double_Uns (D (2))), + D3 => Big (Double_Uns (D (3))), + D4 => Big (Double_Uns (D (4))))); else D (1) := 0; + + pragma Assert + (Is_Mult_Decomposition (D1 => Big (Double_Uns (D (1))), + D2 => Big (Double_Uns (D (2))), + D3 => Big (Double_Uns (D (3))), + D4 => Big (Double_Uns (D (4))))); end if; else diff --git a/gcc/ada/libgnat/s-valuti.adb b/gcc/ada/libgnat/s-valuti.adb index ec6fdb03225..ee37c1a636b 100644 --- a/gcc/ada/libgnat/s-valuti.adb +++ b/gcc/ada/libgnat/s-valuti.adb @@ -123,6 +123,7 @@ is while F < L and then S (F) = ' ' loop pragma Loop_Invariant (F in S'First .. L - 1); pragma Loop_Invariant (for all J in S'First .. F => S (J) = ' '); + pragma Loop_Variant (Increases => F); F := F + 1; end loop; @@ -139,6 +140,7 @@ is while S (L) = ' ' loop pragma Loop_Invariant (L in F + 1 .. S'Last); pragma Loop_Invariant (for all J in L .. S'Last => S (J) = ' '); + pragma Loop_Variant (Decreases => L); L := L - 1; end loop; diff --git a/gcc/ada/libgnat/s-valuti.ads b/gcc/ada/libgnat/s-valuti.ads index 1faa6471d0d..22d0612bc32 100644 --- a/gcc/ada/libgnat/s-valuti.ads +++ b/gcc/ada/libgnat/s-valuti.ads @@ -51,7 +51,8 @@ is procedure Bad_Value (S : String) with - Depends => (null => S); + Depends => (null => S), + Exceptional_Cases => (others => Standard.False); pragma No_Return (Bad_Value); -- Raises constraint error with message: bad input for 'Value: "xxx"