From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id DE57A3858C2F; Mon, 23 Jan 2023 23:35:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DE57A3858C2F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674516918; bh=qyt4qgOyiSYqVdweiS1wUazEXZ+ZfR0oXVjfP+sWXnc=; h=From:To:Subject:Date:From; b=FIWzSD9lUbmNp0cSC5wowGHPbHbaQ8X6yCGeyd/rtC1mP+Xb8x7kkdMkf1kOk9Lxj KW6k0MQkWk3YsAnmRpnHpsv87SWQXdjZ6SMvggmtfRwxt0cw5SY2kVGlFGYs+zVQ1/ pIbhJldKtT52pUbAGuoS1VSWj0UG0h9B0yXaUe88= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5316] c++: TARGET_EXPR_ELIDING_P and std::move [PR107267] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 51767f31878a95161142254dca7119b409699670 X-Git-Newrev: 4cbc71691e47b1ca6b64feb0af678606705d2f92 Message-Id: <20230123233518.DE57A3858C2F@sourceware.org> Date: Mon, 23 Jan 2023 23:35:18 +0000 (GMT) List-Id: https://gcc.gnu.org/g:4cbc71691e47b1ca6b64feb0af678606705d2f92 commit r13-5316-g4cbc71691e47b1ca6b64feb0af678606705d2f92 Author: Jason Merrill Date: Mon Jan 23 17:14:11 2023 -0500 c++: TARGET_EXPR_ELIDING_P and std::move [PR107267] With -ffold-simple-inlines, we turn calls to std::move into the static_cast equivalent. In this testcase, this exposes the FindResult temporary to copy elision which is not specified by the standard, through an optimization in gimplify_modify_expr_rhs. Since the type is not TREE_ADDRESSABLE, this is not detectable by the user, so we just need to soften the assert. PR c++/107267 gcc/cp/ChangeLog: * cp-gimplify.cc (cp_gimplify_init_expr): Allow unexpected elision of trivial types. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/move2.C: New test. Diff: --- gcc/cp/cp-gimplify.cc | 5 ++++- gcc/testsuite/g++.dg/cpp0x/move2.C | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/gcc/cp/cp-gimplify.cc b/gcc/cp/cp-gimplify.cc index 340b4641046..83ba1285bfd 100644 --- a/gcc/cp/cp-gimplify.cc +++ b/gcc/cp/cp-gimplify.cc @@ -250,7 +250,10 @@ cp_gimplify_init_expr (tree *expr_p) if (TREE_CODE (from) == TARGET_EXPR) if (tree init = TARGET_EXPR_INITIAL (from)) { - gcc_checking_assert (TARGET_EXPR_ELIDING_P (from)); + /* Make sure that we expected to elide this temporary. But also allow + gimplify_modify_expr_rhs to elide temporaries of trivial type. */ + gcc_checking_assert (TARGET_EXPR_ELIDING_P (from) + || !TREE_ADDRESSABLE (TREE_TYPE (from))); if (target_expr_needs_replace (from)) { /* If this was changed by cp_genericize_target_expr, we need to diff --git a/gcc/testsuite/g++.dg/cpp0x/move2.C b/gcc/testsuite/g++.dg/cpp0x/move2.C new file mode 100644 index 00000000000..b8c8683c4d2 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/move2.C @@ -0,0 +1,14 @@ +// PR c++/107267 +// { dg-do compile { target c++11 } } +// { dg-additional-options -ffold-simple-inlines } + +namespace std { + template _Tp &&move(_Tp &&); +} + +struct FindResult { + FindResult(); + int result; +}; + +FindResult pop_ret = std::move(FindResult());