aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2023-01-23 17:14:11 -0500
committerJason Merrill <jason@redhat.com>2023-01-23 18:35:11 -0500
commit4cbc71691e47b1ca6b64feb0af678606705d2f92 (patch)
treec3f5b175c0ad4ff4e3e7e7ac8574e254251e018f
parent51767f31878a95161142254dca7119b409699670 (diff)
downloadgcc-4cbc71691e47b1ca6b64feb0af678606705d2f92.zip
gcc-4cbc71691e47b1ca6b64feb0af678606705d2f92.tar.gz
gcc-4cbc71691e47b1ca6b64feb0af678606705d2f92.tar.bz2
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.
-rw-r--r--gcc/cp/cp-gimplify.cc5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/move2.C14
2 files changed, 18 insertions, 1 deletions
diff --git a/gcc/cp/cp-gimplify.cc b/gcc/cp/cp-gimplify.cc
index 340b464..83ba128 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 0000000..b8c8683
--- /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<typename _Tp> _Tp &&move(_Tp &&);
+}
+
+struct FindResult {
+ FindResult();
+ int result;
+};
+
+FindResult pop_ret = std::move(FindResult());