From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 4B9BE385C301 for ; Wed, 24 Jan 2024 19:37:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4B9BE385C301 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4B9BE385C301 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706125077; cv=none; b=jsalBBoakE3z4uTqV8vLQBznKHTUR7/lCQ+wxaUyrPkjdSlwQBGrsG3guQMW+cf3OgtYL89Lq5h35C5iWfThXXPKvu7+yNOGZI7FN1TAUvbPEzAG0wElRvWZnc0S5pDmSegHmeFmcmJL1LGMmTrarTj09cYxqxpY/KhdspoepOQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706125077; c=relaxed/simple; bh=WO2tmRPubRwFSFB3S5DBpNyRaaFu0aDNsHci3wkVw04=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=sL8TTh1ucZ8U03oy/XhqTCH+o28oCWtmEfShNUndLVqnrpMs25a7w6IQL9HtmB6KTgTv1k1zTh/4F6uxaMLriAjoc9MQ/SklKJreb+qD5hL/MgpC9jVexNDxM9fwCkhEluv6HD97XW491tj6bTb0QMceN/bahRKHWUbD0oJ/hvc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706125073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VENMkLYQ7jRYLTQX40tFhxEht7EQdXYlZe7/dPfHKfQ=; b=DQC7a2lYykS9d45kVbjTVraE++xiv53xk/ja8iUywykUWlKffRTA0MOqIUR2A6LabVM4FP Z/eg8eHNcY3mgiZ783l4ublO020DM2LeK+N2bbToJWIFKJS99AV124rX/hRW/KxQgiTFeN oazL/KvhD490dkVqq6GcHy06bZiPlxU= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-70-c6F651hsMu-kuKQGTLeZ9Q-1; Wed, 24 Jan 2024 14:37:51 -0500 X-MC-Unique: c6F651hsMu-kuKQGTLeZ9Q-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7832a94b051so771019985a.2 for ; Wed, 24 Jan 2024 11:37:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706125071; x=1706729871; 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=VENMkLYQ7jRYLTQX40tFhxEht7EQdXYlZe7/dPfHKfQ=; b=Gb+la7yB+Gobr3JHBoye5YfjfkWvCEHfUuv29wmutspDfbFXj05OoQY46QoYhytpiz NS4/mZ0Tv7YlBe21Mg6FLyh3UIEKTzxIAI9q/nuYvXt2DTSBTPJZqOcJRrsqev9eC67q IDSnnWD1T0/k1dN7HXb8THXyhvXMqNtWj6MR2DfDcikRLSaQg+IKKedl7mV/6T6Xfn8B XEz5qlFkKu5eJpRWu6ieMBodkgr6M3QY2otdQqfz9XjNT4lNiiqQ304N7pqx0Q7EQUAA N04bIajCluiDOTsF9Sy/MDDWf3eQLseNhLMPEXIKHHrj9ZgjeyWZlTEqVMBlBWpwJ0Xf BAaw== X-Gm-Message-State: AOJu0YzgcDXo7ratgxf6akwiYQhV6A+xX4pVkjWg0drcLH+yD2Wi55rW X/D+y87lhIhE9n++ZtzVJzF9I3UQH/s8a3qW2k1AKqyYj8UGNYyuP9yLCxIzAYrpLwZYEV5s0Zp rLx0K2KGdo3j70gamcJSVENWuPs7YtdxdLUaz71V+4MQhCdvkeJLJ/bvqUp6vv9d0mGvHeK+MVR UIs+AOJJ7OTY7FeYcRqvLlYdukcd73vBBVD1w= X-Received: by 2002:a05:620a:2ec:b0:783:b4fc:e638 with SMTP id a12-20020a05620a02ec00b00783b4fce638mr1539537qko.14.1706125071083; Wed, 24 Jan 2024 11:37:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IF1MId4XgLCgbtp+B2lfUvgn5h0eRqLxw5vw9PnuQj1pTQf1OCn45wWx9xtsr/0vsuJGJVirQ== X-Received: by 2002:a05:620a:2ec:b0:783:b4fc:e638 with SMTP id a12-20020a05620a02ec00b00783b4fce638mr1539531qko.14.1706125070742; Wed, 24 Jan 2024 11:37:50 -0800 (PST) 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 i5-20020a05620a248500b0078397efd1e3sm3716527qkn.31.2024.01.24.11.37.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 11:37:50 -0800 (PST) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: throwing cleanup after return [PR113347] Date: Wed, 24 Jan 2024 14:37:47 -0500 Message-Id: <20240124193747.966463-1-jason@redhat.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.2 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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,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 List-Id: Tested x86_64-pc-linux-gnu, applying to 12/13. -- 8< -- Here we were assuming that current_retval_sentinel would be set if we have seen a throwing cleanup, but that's not the case if the cleanup is after all returns. This change isn't needed on trunk, where current_retval_sentinel is set for all NRV functions. PR c++/113347 gcc/cp/ChangeLog: * semantics.cc (finalize_nrv_r): Handle null current_retval_sentinel. gcc/testsuite/ChangeLog: * g++.dg/eh/return3.C: New test. --- gcc/cp/semantics.cc | 3 ++- gcc/testsuite/g++.dg/eh/return3.C | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/eh/return3.C diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 02838775003..ff5252905fe 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -4953,7 +4953,8 @@ finalize_nrv_r (tree* tp, int* walk_subtrees, void* data) /* If a cleanup might throw, we need to clear current_retval_sentinel on the exception path so an outer cleanup added by maybe_splice_retval_cleanup doesn't run. */ - if (cp_function_chain->throwing_cleanup) + if (current_retval_sentinel + && cp_function_chain->throwing_cleanup) { tree clear = build2 (MODIFY_EXPR, boolean_type_node, current_retval_sentinel, diff --git a/gcc/testsuite/g++.dg/eh/return3.C b/gcc/testsuite/g++.dg/eh/return3.C new file mode 100644 index 00000000000..76aa50d523d --- /dev/null +++ b/gcc/testsuite/g++.dg/eh/return3.C @@ -0,0 +1,17 @@ +// PR c++/113347 + +#if __cplusplus < 201103L +#define THROWS +#else +#define THROWS noexcept(false) +#endif + +struct A { ~A(); }; +struct B { ~B() THROWS; }; + +A f() +{ + A a; + return a; + B(); +} base-commit: 46874833290ee5fcd94c6e184fcd51fcd2c74e28 -- 2.39.3