* [v3 PATCH] PR libstdc++/77727
@ 2016-09-26 2:39 Ville Voutilainen
2016-09-26 10:53 ` Jonathan Wakely
0 siblings, 1 reply; 2+ messages in thread
From: Ville Voutilainen @ 2016-09-26 2:39 UTC (permalink / raw)
To: libstdc++, gcc-patches
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
Tested on Linux-x64.
2016-09-26 Ville Voutilainen <ville.voutilainen@gmail.com>
PR libstdc++/77727
* include/std/optional (optional(const optional<_Up>&)):
Default-initialize the base and use emplace.
(optional(optional<_Up>&&)): Likewise.
* testsuite/20_util/optional/cons/77727.cc: New.
[-- Attachment #2: 77727.diff --]
[-- Type: text/plain, Size: 3571 bytes --]
diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional
index efb0eb6..b14faf1 100644
--- a/libstdc++-v3/include/std/optional
+++ b/libstdc++-v3/include/std/optional
@@ -502,7 +502,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__not_<__converts_from_optional<_Tp, _Up>>
>::value, bool> = true>
constexpr optional(const optional<_Up>& __t)
- : _Base(__t ? _Base(std::in_place, *__t) : _Base()) { }
+ {
+ if (__t)
+ emplace(*__t);
+ }
template <typename _Up,
enable_if_t<__and_<
@@ -512,7 +515,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__not_<__converts_from_optional<_Tp, _Up>>
>::value, bool> = false>
explicit constexpr optional(const optional<_Up>& __t)
- : _Base(__t ? _Base(std::in_place, *__t) : _Base()) { }
+ {
+ if (__t)
+ emplace(*__t);
+ }
template <typename _Up,
enable_if_t<__and_<
@@ -522,7 +528,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__not_<__converts_from_optional<_Tp, _Up>>
>::value, bool> = true>
constexpr optional(optional<_Up>&& __t)
- : _Base(__t ? _Base(std::in_place, std::move(*__t)) : _Base()) { }
+ {
+ if (__t)
+ emplace(std::move(*__t));
+ }
template <typename _Up,
enable_if_t<__and_<
@@ -532,7 +541,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__not_<__converts_from_optional<_Tp, _Up>>
>::value, bool> = false>
explicit constexpr optional(optional<_Up>&& __t)
- : _Base(__t ? _Base(std::in_place, std::move(*__t)) : _Base()) { }
+ {
+ if (__t)
+ emplace(std::move(*__t));
+ }
template<typename... _Args>
explicit constexpr optional(in_place_t, _Args&&... __args)
diff --git a/libstdc++-v3/testsuite/20_util/optional/cons/77727.cc b/libstdc++-v3/testsuite/20_util/optional/cons/77727.cc
new file mode 100644
index 0000000..7a3b101
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/optional/cons/77727.cc
@@ -0,0 +1,51 @@
+// { dg-options "-std=gnu++17" }
+// { dg-do run }
+
+// Copyright (C) 2016 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a moved_to of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <optional>
+#include <testsuite_hooks.h>
+
+
+struct NonTransferable
+{
+ int x;
+ NonTransferable(int x) : x(x) {}
+ NonTransferable(NonTransferable&&) = delete;
+ NonTransferable& operator=(NonTransferable&&) = delete;
+ operator int() {return x;}
+};
+
+int main()
+{
+ std::optional<int> oi;
+ std::optional<NonTransferable> ot(std::move(oi));
+ VERIFY(!ot);
+
+ std::optional<int> oi2;
+ std::optional<NonTransferable> ot2(oi2);
+ VERIFY(!ot);
+
+ std::optional<int> oi3{42};
+ std::optional<NonTransferable> ot3(std::move(oi3));
+ VERIFY(ot3 && *ot3 == 42);
+
+ std::optional<int> oi4{666};
+ std::optional<NonTransferable> ot4(oi4);
+ VERIFY(ot4 && *ot4 == 666);
+}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [v3 PATCH] PR libstdc++/77727
2016-09-26 2:39 [v3 PATCH] PR libstdc++/77727 Ville Voutilainen
@ 2016-09-26 10:53 ` Jonathan Wakely
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Wakely @ 2016-09-26 10:53 UTC (permalink / raw)
To: Ville Voutilainen; +Cc: libstdc++, gcc-patches
On 26/09/16 02:06 +0300, Ville Voutilainen wrote:
> PR libstdc++/77727
> * include/std/optional (optional(const optional<_Up>&)):
> Default-initialize the base and use emplace.
> (optional(optional<_Up>&&)): Likewise.
> * testsuite/20_util/optional/cons/77727.cc: New.
OK, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-26 10:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-26 2:39 [v3 PATCH] PR libstdc++/77727 Ville Voutilainen
2016-09-26 10:53 ` Jonathan Wakely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).