From patchwork Wed Jun 7 01:30:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 70687 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 70BFB385773C for ; Wed, 7 Jun 2023 01:31:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 70BFB385773C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1686101470; bh=Ag4E/vBm/7nMuU5nEAMbuJ6hDQPEXpVhndUCrF7MHD8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=vnDdGADUWWWnoxF/6/MvMJtV5sCLmIJzrQzbVv99N1jH69kXDEpqrlX5ECjadfDa7 SX9XggaBdPVy2bjA3qVUI/LjS05082IDX7DfvN6OOj0ahC/HGYowpRHjAfwknkpc5c VI+orw0ql81+altf32spGavO8nX75becmZyaY4yk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id B50853857806 for ; Wed, 7 Jun 2023 01:30:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B50853857806 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-541-FQ9gOXDJNHOazZI7AjbSHA-1; Tue, 06 Jun 2023 21:30:31 -0400 X-MC-Unique: FQ9gOXDJNHOazZI7AjbSHA-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-616731c798dso873606d6.1 for ; Tue, 06 Jun 2023 18:30:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686101431; x=1688693431; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ag4E/vBm/7nMuU5nEAMbuJ6hDQPEXpVhndUCrF7MHD8=; b=UluJFWfMQwNQ0XWuK1Lc926UucCfLH3nIFDsHW4F+zXLCn3Pu+BU8Gr/M95sXtNJl4 doMlkdOZWXU21L5oGZU6Fel4kV5dM2GF+mCFlLnyFBYHaFnbBHT+HmxdZgdSvWvS7Urz uEt6gxOlqEiYNKlnX5YeNMlCzN9z0clFvyHMT4UBNt4saGB3XEouCsDvKB6GowOvFvOr RlHyqBorUU1ZhpIL2C0NRDFzVXrQoGsEy3Vd6U3/K7bm38alkBdX6/oazhjKPCjr5wBv l51h0cu3TWVAT4sI6L0gYgqauFG4Mu+n9zziAiDBPJHdPn4QSihdOmfIA5fJvXjJsOC6 EZEQ== X-Gm-Message-State: AC+VfDwQm4gbyItiPWg0YcnTbBGMtALfz8W46vi+86WRt6pjhgTkaLDm xFKR3UW9Sf0au1z3q5L2tifbnJikdoPAqmTFeKlCCEkyOAO+otSHYpqdkSRfR+F9DJ0qNmU/3H7 QDMGKFjqWl11N/yzAs1H+uxWYDuCbe3gNyAUIvY78uXsBxRxIbVUZdZAMOOrqILdF8eZa8LFogQ == X-Received: by 2002:a05:6214:1948:b0:626:1741:f3f3 with SMTP id q8-20020a056214194800b006261741f3f3mr1519922qvk.28.1686101430921; Tue, 06 Jun 2023 18:30:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ527GoOHkKABGiU6H3/RVUeS6CzkCfvbE1x+TwkETSqESaw79tkWSUnwlV08qUUp3KzVGDSZQ== X-Received: by 2002:a05:6214:1948:b0:626:1741:f3f3 with SMTP id q8-20020a056214194800b006261741f3f3mr1519903qvk.28.1686101430458; Tue, 06 Jun 2023 18:30:30 -0700 (PDT) Received: from jason.com (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id i16-20020a0cfcd0000000b0061b7f6b5e15sm5667438qvq.140.2023.06.06.18.30.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 18:30:29 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: fix contracts with NRV Date: Tue, 6 Jun 2023 21:30:28 -0400 Message-Id: <20230607013028.2770448-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, 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: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- The NRV implementation was blindly replacing the operand of RETURN_EXPR, clobbering anything that check_return_expr might have added on to the actual initialization, such as checking the postcondition. gcc/cp/ChangeLog: * semantics.cc (finalize_nrv_r): [RETURN_EXPR]: Only replace the INIT_EXPR. gcc/testsuite/ChangeLog: * g++.dg/contracts/contracts-post7.C: New test. --- gcc/cp/semantics.cc | 12 ++++++-- .../g++.dg/contracts/contracts-post7.C | 29 +++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/contracts/contracts-post7.C base-commit: 29c82c6ca929e0f5eccfe038dea71177d814c6b7 prerequisite-patch-id: aed53cdac161144c31cb1433282e1ad1d49d3770 diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index c04514679f0..c94ea090a99 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -4940,9 +4940,17 @@ finalize_nrv_r (tree* tp, int* walk_subtrees, void* data) *walk_subtrees = 0; /* Change all returns to just refer to the RESULT_DECL; this is a nop, but differs from using NULL_TREE in that it indicates that we care - about the value of the RESULT_DECL. */ + about the value of the RESULT_DECL. But preserve anything appended + by check_return_expr. */ else if (TREE_CODE (*tp) == RETURN_EXPR) - TREE_OPERAND (*tp, 0) = dp->result; + { + tree *p = &TREE_OPERAND (*tp, 0); + while (TREE_CODE (*p) == COMPOUND_EXPR) + p = &TREE_OPERAND (*p, 0); + gcc_checking_assert (TREE_CODE (*p) == INIT_EXPR + && TREE_OPERAND (*p, 0) == dp->result); + *p = dp->result; + } /* Change all cleanups for the NRV to only run when an exception is thrown. */ else if (TREE_CODE (*tp) == CLEANUP_STMT diff --git a/gcc/testsuite/g++.dg/contracts/contracts-post7.C b/gcc/testsuite/g++.dg/contracts/contracts-post7.C new file mode 100644 index 00000000000..1c33181b5e6 --- /dev/null +++ b/gcc/testsuite/g++.dg/contracts/contracts-post7.C @@ -0,0 +1,29 @@ +// { dg-do run } +// { dg-options "-std=c++2a -fcontracts" } + +#include + +using std::experimental::contract_violation; +void handle_contract_violation(const contract_violation &violation) +{ + __builtin_exit (0); +} + +struct A { + int i; + A(): i(42) {} + A(const A&); +}; + +A f() + [[ post r: r.i == 24 ]] +{ + A a; + return a; +} + +int main() +{ + f(); + return -1; +}