On 31 October 2016 at 15:31, Jason Merrill <ja...@redhat.com> wrote:
> Good idea. You might put the reuse in a separate function in order to
> hide it from the optimizer.
Ok, new patch, tested on Linux-x64, ok for trunk?
2016-10-31 Ville Voutilainen <ville.voutilai...@gmail.com>
Add tests for a const member and a reference member for launder.
* g++.dg/cpp1z/launder3.C: New.
* g++.dg/cpp1z/launder4.C: Likewise.
* g++.dg/cpp1z/launder5.C: Likewise.
* g++.dg/cpp1z/launder5.cc: Likewise.
* g++.dg/cpp1z/launder5.h: Likewise.
* g++.dg/cpp1z/launder6.C: Likewise.
* g++.dg/cpp1z/launder6.cc: Likewise.
* g++.dg/cpp1z/launder6.h: Likewise.
diff --git a/gcc/testsuite/g++.dg/cpp1z/launder3.C
b/gcc/testsuite/g++.dg/cpp1z/launder3.C
new file mode 100644
index 0000000..2a2afc5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/launder3.C
@@ -0,0 +1,38 @@
+// { dg-do run { target c++11 } }
+// { dg-additional-options "-O2" }
+
+#include <cassert>
+
+void *
+operator new (decltype (sizeof (0)), void *p)
+{
+ return p;
+}
+
+namespace std
+{
+ template <typename T>
+ T *
+ launder (T *p)
+ {
+ return __builtin_launder (p);
+ }
+}
+
+struct A
+{
+ const int x;
+};
+
+struct B
+{
+ A a;
+};
+
+int
+main ()
+{
+ B b{{42}};
+ new (&b.a) A{666};
+ assert(std::launder(&b.a)->x == 666);
+}
diff --git a/gcc/testsuite/g++.dg/cpp1z/launder4.C
b/gcc/testsuite/g++.dg/cpp1z/launder4.C
new file mode 100644
index 0000000..3a65eb2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/launder4.C
@@ -0,0 +1,40 @@
+// { dg-do run { target c++11 } }
+// { dg-additional-options "-O2" }
+
+#include <cassert>
+
+void *
+operator new (decltype (sizeof (0)), void *p)
+{
+ return p;
+}
+
+namespace std
+{
+ template <typename T>
+ T *
+ launder (T *p)
+ {
+ return __builtin_launder (p);
+ }
+}
+
+struct A
+{
+ int& x;
+};
+
+struct B
+{
+ A a;
+};
+
+int
+main ()
+{
+ int x = 42;
+ B b{{x}};
+ int y = 666;
+ new (&b.a) A{y};
+ assert(std::launder(&b.a)->x == 666);
+}
diff --git a/gcc/testsuite/g++.dg/cpp1z/launder5.C
b/gcc/testsuite/g++.dg/cpp1z/launder5.C
new file mode 100644
index 0000000..483d6f2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/launder5.C
@@ -0,0 +1,25 @@
+// { dg-do run { target c++11 } }
+// { dg-additional-options "-O2" }
+// { dg-additional-sources "launder5.cc" }
+
+#include <cassert>
+#include "launder5.h"
+
+namespace std
+{
+ template <typename T>
+ T *
+ launder (T *p)
+ {
+ return __builtin_launder (p);
+ }
+}
+
+
+int
+main ()
+{
+ B b{{42}};
+ f(b);
+ assert(std::launder(&b.a)->x == 666);
+}
diff --git a/gcc/testsuite/g++.dg/cpp1z/launder5.cc
b/gcc/testsuite/g++.dg/cpp1z/launder5.cc
new file mode 100644
index 0000000..f9d867d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/launder5.cc
@@ -0,0 +1,12 @@
+#include "launder5.h"
+
+void *
+operator new (decltype (sizeof (0)), void *p)
+{
+ return p;
+}
+
+void f(B& b)
+{
+ new (&b.a) A{666};
+}
diff --git a/gcc/testsuite/g++.dg/cpp1z/launder5.h
b/gcc/testsuite/g++.dg/cpp1z/launder5.h
new file mode 100644
index 0000000..b66103a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/launder5.h
@@ -0,0 +1,16 @@
+#ifndef GCC_TEST_LAUNDER5_H
+#define GCC_TEST_LAUNDER5_H
+
+struct A
+{
+ const int x;
+};
+
+struct B
+{
+ A a;
+};
+
+void f(B& b);
+
+#endif
diff --git a/gcc/testsuite/g++.dg/cpp1z/launder6.C
b/gcc/testsuite/g++.dg/cpp1z/launder6.C
new file mode 100644
index 0000000..babc4b4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/launder6.C
@@ -0,0 +1,24 @@
+// { dg-do run { target c++11 } }
+// { dg-additional-options "-O2" }
+// { dg-additional-sources "launder6.cc" }
+#include <cassert>
+#include "launder6.h"
+
+namespace std
+{
+ template <typename T>
+ T *
+ launder (T *p)
+ {
+ return __builtin_launder (p);
+ }
+}
+
+int
+main ()
+{
+ int x = 42;
+ B b{{x}};
+ f(b);
+ assert(std::launder(&b.a)->x == 666);
+}
diff --git a/gcc/testsuite/g++.dg/cpp1z/launder6.cc
b/gcc/testsuite/g++.dg/cpp1z/launder6.cc
new file mode 100644
index 0000000..1822891
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/launder6.cc
@@ -0,0 +1,14 @@
+#include "launder6.h"
+
+void *
+operator new (decltype (sizeof (0)), void *p)
+{
+ return p;
+}
+
+int y = 666;
+
+void f(B& b)
+{
+ new (&b.a) A{y};
+}
diff --git a/gcc/testsuite/g++.dg/cpp1z/launder6.h
b/gcc/testsuite/g++.dg/cpp1z/launder6.h
new file mode 100644
index 0000000..eca2ad4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/launder6.h
@@ -0,0 +1,16 @@
+#ifndef GCC_TEST_LAUNDER6_H
+#define GCC_TEST_LAUNDER6_H
+
+struct A
+{
+ int& x;
+};
+
+struct B
+{
+ A a;
+};
+
+void f(B& b);
+
+#endif
