From: Jason Merrill <jason@redhat.com>
Date: Thu, 1 Feb 2024 22:23:53 +0000 (-0500)
Subject: c++: no_unique_address and constexpr [PR112439]
X-Git-Tag: releases/gcc-13.3.0~510
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bae2c531d2ea8f7872ed41f273b6fabaa6a9965;p=thirdparty%2Fgcc.git

c++: no_unique_address and constexpr [PR112439]

Here, because we don't build a CONSTRUCTOR for an empty base, we were
wrongly marking the Foo CONSTRUCTOR as complete after initializing the Empty
member.  Fixed by checking empty_base here as well.

	PR c++/112439

gcc/cp/ChangeLog:

	* constexpr.cc (cxx_eval_store_expression): Check empty_base
	before marking a CONSTRUCTOR readonly.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp2a/no_unique_address15.C: New test.

(cherry picked from commit f4998609908e4926fc095ce97cb84b187294fd1d)
---

diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc
index f99d55af02dc..ab129c087555 100644
--- a/gcc/cp/constexpr.cc
+++ b/gcc/cp/constexpr.cc
@@ -6298,6 +6298,7 @@ cxx_eval_store_expression (const constexpr_ctx *ctx, tree t,
      object.  Make a note of this fact by marking the CONSTRUCTOR
      TREE_READONLY.  */
   if (TREE_CODE (t) == INIT_EXPR
+      && !empty_base
       && TREE_CODE (*valp) == CONSTRUCTOR
       && TYPE_READONLY (type))
     {
diff --git a/gcc/testsuite/g++.dg/cpp2a/no_unique_address15.C b/gcc/testsuite/g++.dg/cpp2a/no_unique_address15.C
new file mode 100644
index 000000000000..3e7cf0838e18
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/no_unique_address15.C
@@ -0,0 +1,19 @@
+// PR c++/112439
+// { dg-do compile { target c++14 } }
+
+struct Empty {};
+
+class Foo {
+public:
+    constexpr Foo(int x, Empty y, int z) : a(x), b(y)
+    {
+        c = z;
+    }
+
+private:
+    int a{};
+    [[no_unique_address]] Empty b{};
+    [[no_unique_address]] int c{};
+};
+
+constexpr Foo r{1, {}, 3};