diff mbox series

[committed,1/3] libstdc++: Fix std::bad_expected_access constructor [PR105146]

Message ID 20220408173806.336422-1-jwakely@redhat.com
State New
Headers show
Series [committed,1/3] libstdc++: Fix std::bad_expected_access constructor [PR105146] | expand

Commit Message

Jonathan Wakely April 8, 2022, 5:38 p.m. UTC 
Tested x86_64-linux, pushed to trunk.

-- >8 --

libstdc++-v3/ChangeLog:

	PR libstdc++/105146
	* include/std/expected (bad_expected_access): Move constructor
	parameter.
	* testsuite/20_util/expected/bad.cc: New test.
---
 libstdc++-v3/include/std/expected              |  2 +-
 libstdc++-v3/testsuite/20_util/expected/bad.cc | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 libstdc++-v3/testsuite/20_util/expected/bad.cc
diff mbox series

Patch

diff --git a/libstdc++-v3/include/std/expected b/libstdc++-v3/include/std/expected
index 39d07cda4a9..7b01a17fb57 100644
--- a/libstdc++-v3/include/std/expected
+++ b/libstdc++-v3/include/std/expected
@@ -95,7 +95,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
     class bad_expected_access : public bad_expected_access<void> {
     public:
       explicit
-      bad_expected_access(_Er __e) : _M_val(__e) { }
+      bad_expected_access(_Er __e) : _M_val(std::move(__e)) { }
 
       // XXX const char* what() const noexcept override;
 
diff --git a/libstdc++-v3/testsuite/20_util/expected/bad.cc b/libstdc++-v3/testsuite/20_util/expected/bad.cc
new file mode 100644
index 00000000000..17bc6d69e88
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/expected/bad.cc
@@ -0,0 +1,15 @@ 
+// { dg-options "-std=gnu++23" }
+// { dg-do compile }
+
+#include <expected>
+
+struct E {
+  E() = default;
+  E(E&&) = default;
+};
+
+void
+test_pr105146()
+{
+  std::bad_expected_access(E{});
+}