From: Jason Merrill <jason@redhat.com>
Date: Wed, 8 Jan 2020 20:31:20 +0000 (-0500)
Subject: PR c++/91369 - constexpr destructor and member initializer.
X-Git-Tag: misc/cutover-git~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10d2f801f472931137deae1714d5b690c1862037;p=thirdparty%2Fgcc.git

PR c++/91369 - constexpr destructor and member initializer.

Previously it didn't matter whether we looked through a TARGET_EXPR in
constexpr evaluation, but now that we have constexpr destructors it does.
On IRC I mentioned the idea of clearing TARGET_EXPR_CLEANUP in
digest_nsdmi_init, but since this initialization is expressed by an
INIT_EXPR, it's better to handle all INIT_EXPR, not just those for a member
initializer.

	* constexpr.c (cxx_eval_store_expression): Look through TARGET_EXPR
	when not preevaluating.

From-SVN: r280018
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c650fdeb5900..7aacbe2334b6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2020-01-08  Jason Merrill  <jason@redhat.com>
+
+	PR c++/91369 - constexpr destructor and member initializer.
+	* constexpr.c (cxx_eval_store_expression): Look through TARGET_EXPR
+	when not preevaluating.
+
 2020-01-08  Jason Merrill  <jason@redhat.com>
 
 	* constexpr.c (cxx_eval_call_expression): Remove DECL_BY_REFERENCE
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 806d3ab2cffb..5fe6d0277b60 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -4577,6 +4577,12 @@ cxx_eval_store_expression (const constexpr_ctx *ctx, tree t,
 	}
       new_ctx.ctor = *valp;
       new_ctx.object = target;
+      /* Avoid temporary materialization when initializing from a TARGET_EXPR.
+	 We don't need to mess with AGGR_EXPR_SLOT/VEC_INIT_EXPR_SLOT because
+	 expansion of those trees uses ctx instead.  */
+      if (TREE_CODE (init) == TARGET_EXPR)
+	if (tree tinit = TARGET_EXPR_INITIAL (init))
+	  init = tinit;
       init = cxx_eval_constant_expression (&new_ctx, init, false,
 					   non_constant_p, overflow_p);
       if (ctors->is_empty())
diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-new10.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-new10.C
new file mode 100644
index 000000000000..500a3240c8fe
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-new10.C
@@ -0,0 +1,19 @@
+// PR c++/91369
+// { dg-do compile { target c++2a } }
+
+struct S {
+  constexpr S (int* i) : s{i} {}
+  constexpr ~S () { delete s; }
+  int *s;
+};
+
+struct T { S t = { new int }; };
+
+constexpr auto
+foo ()
+{
+  T b;
+  return true;
+}
+
+static_assert (foo ());