From patchwork Sat Dec 10 09:42:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Arsen_Arsenovi=C4=87?= X-Patchwork-Id: 2844 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1223907wrr; Sat, 10 Dec 2022 01:49:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf4BL33Rd1eAmfKYOZo5TqEHpD1mXR4YB/8SPtYqTpD+DsYrD+ogEHg5zcIbSe+G6VQiYIzO X-Received: by 2002:a17:907:cb83:b0:78d:f455:b5d8 with SMTP id un3-20020a170907cb8300b0078df455b5d8mr9573873ejc.24.1670665793632; Sat, 10 Dec 2022 01:49:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670665793; cv=none; d=google.com; s=arc-20160816; b=SNNL/6ZXo51oBbaJnaNuW7ONJQMw/j3trdggg2g2pi8tHFqfkFwcq4BzLoMw1q+QFO dISLX3hYi4z1rV20BdHMoY0VOzpG8dAmuDH36XbTXecFHtLsrVvKpjElWs1WcSQKD+am bd8my2EFSJxO6atWF/4PKOTmT2UtssY3ylQyVvueor1LGXxnyh2hVQPN7imrlvKQTiKV VrPef8rJrExVgu2DXGeXB/P/MqeAFk+iIRKRyU7Ks3+hM8wbY5ZrgL7xEz/yykaFZiqV KvYuc/hXQkANg576VlV4g9AcjmIbGGyHRULtgnfAeafvJyRgSdSXAOgy+/OVKwFKKRpc CsaA== 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=KG1qbDAbPvbLkNBlEsIoYCXyqbM6nBKqi2mJacc6gis=; b=UHy41O3Ak64ZClZvnXoLHB7loGDP1+SVe+loKc6eY2tUT6nrcZgveaPu37OBsso1V3 IYCpQMcLq0dZ/wZPtnqSIqM1pH80oYrjE63ZbBWU0ecofDyyu9nEYqiZX9BrIXqSQ5ce ZiGgva5RpSrJgENc9MD98AniaUQPLPqMniX+Bs0/c3IvmEh3ujOyBV+p7h7uwahqkJtC Z/DbD8LOhs/PFVzkHD010sTMjeyQahBeFEXEnlmd4LCfcffeWrJJ5kIpw484QZb47JSD nrR+4y2i8aIM0ll4Spv6x3xYsHtKW1ZgsDFFVnIrw5h6jLOaSrSHejt63lNb87hGjKsZ 0KXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=W+uxxE1X; 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 hq7-20020a1709073f0700b0073d5a794b43si1817632ejc.985.2022.12.10.01.49.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Dec 2022 01:49:53 -0800 (PST) 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=W+uxxE1X; 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 4141C384FE92 for ; Sat, 10 Dec 2022 09:49:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4141C384FE92 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670665778; bh=KG1qbDAbPvbLkNBlEsIoYCXyqbM6nBKqi2mJacc6gis=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=W+uxxE1X4jFHOfHKnIWh5JemBfv5mptc4GtyGzrLx8SJMXqlbsxqvjdkcbvs8HcKG u3P+9PNO+mxvzPk9M8sVpQX/Mcpjm0gLkwd0ge78VEI/9tXkWOte89t9PIJGV4030d nBji/K4jc8rCBK1y+n33/lWIAeWQ4BtDrccj/zKk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [IPv6:2001:67c:2050:0:465::102]) by sourceware.org (Postfix) with ESMTPS id F339D385189F; Sat, 10 Dec 2022 09:48:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F339D385189F Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4NTjkz2wWrz9sTN; Sat, 10 Dec 2022 10:48:43 +0100 (CET) To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, jwakely@redhat.com, libstdc++@gcc.gnu.org, =?utf-8?q?A?= =?utf-8?q?rsen_Arsenovi=C4=87?= Subject: [PATCH 0/4] c++: Small tweaks to contracts Date: Sat, 10 Dec 2022 10:42:59 +0100 Message-Id: <20221210094303.2180127-1-arsen@aarsen.me> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4NTjkz2wWrz9sTN X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_INFOUSMEBIZ, RCVD_IN_DNSWL_LOW, 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?Arsen_Arsenovi=C4=87_via_Gcc-patches?= From: =?utf-8?q?Arsen_Arsenovi=C4=87?= Reply-To: =?utf-8?q?Arsen_Arsenovi=C4=87?= 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?1751820055536904851?= X-GMAIL-MSGID: =?utf-8?q?1751820055536904851?= Hi, This patchset includes minor tweaks to contracts, namely, lowercasing the continuation mode constants to align better with the rest of the standard, and updating the testsuite to match Jonathans new default contract violation handler (that patch is also included). Tested on x86_64-pc-linux-gnu --disable-sanitizers, via check-g++. Arsen Arsenović (3): contracts: Lowercase {MAYBE,NEVER}_CONTINUE contracts: Update testsuite against new default viol. handler format contrib: Add dg-out-generator.pl Jonathan Wakely (1): libstdc++: Improve output of default contract violation handler [PR107792] contrib/dg-out-generator.pl | 67 +++++++ gcc/cp/contracts.cc | 4 +- .../g++.dg/contracts/contracts-access1.C | 36 ++-- .../g++.dg/contracts/contracts-config1.C | 20 +-- .../g++.dg/contracts/contracts-constexpr1.C | 16 +- .../g++.dg/contracts/contracts-ctor-dtor1.C | 96 +++++----- .../g++.dg/contracts/contracts-deduced2.C | 20 +-- .../g++.dg/contracts/contracts-friend1.C | 10 +- .../g++.dg/contracts/contracts-multiline1.C | 2 +- .../g++.dg/contracts/contracts-post3.C | 2 +- .../g++.dg/contracts/contracts-pre10.C | 120 ++++++++----- .../g++.dg/contracts/contracts-pre2.C | 36 ++-- .../g++.dg/contracts/contracts-pre2a2.C | 6 +- .../g++.dg/contracts/contracts-pre3.C | 156 ++++++++--------- .../g++.dg/contracts/contracts-pre4.C | 12 +- .../g++.dg/contracts/contracts-pre5.C | 24 +-- .../g++.dg/contracts/contracts-pre7.C | 24 +-- .../g++.dg/contracts/contracts-pre9.C | 24 +-- .../g++.dg/contracts/contracts-redecl3.C | 36 ++-- .../g++.dg/contracts/contracts-redecl4.C | 24 +-- .../g++.dg/contracts/contracts-redecl6.C | 36 ++-- .../g++.dg/contracts/contracts-redecl7.C | 18 +- .../g++.dg/contracts/contracts-tmpl-spec1.C | 26 +-- .../g++.dg/contracts/contracts-tmpl-spec2.C | 164 ++++++++++++------ .../g++.dg/contracts/contracts-tmpl-spec3.C | 19 +- gcc/testsuite/g++.dg/contracts/contracts10.C | 16 +- gcc/testsuite/g++.dg/contracts/contracts19.C | 4 +- gcc/testsuite/g++.dg/contracts/contracts25.C | 8 +- gcc/testsuite/g++.dg/contracts/contracts3.C | 2 +- gcc/testsuite/g++.dg/contracts/contracts35.C | 16 +- gcc/testsuite/g++.dg/contracts/contracts5.C | 2 +- gcc/testsuite/g++.dg/contracts/contracts7.C | 2 +- gcc/testsuite/g++.dg/contracts/contracts9.C | 24 ++- libstdc++-v3/include/experimental/contract | 2 +- libstdc++-v3/src/experimental/contract.cc | 23 +-- 35 files changed, 629 insertions(+), 468 deletions(-) create mode 100755 contrib/dg-out-generator.pl