On 21/04/20 20:58 +0530, kamlesh kumar via Libstdc++ wrote:
added VERIFY in test and changed the template parameter naming.
diff --git a/libstdc++-v3/include/std/any b/libstdc++-v3/include/std/any
index 6b7e68f0e63..d350d0b2575 100644
--- a/libstdc++-v3/include/std/any
+++ b/libstdc++-v3/include/std/any
@@ -176,36 +176,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typename __any_constructible<bool, _Tp, _Args...>::type;
/// Construct with a copy of @p __value as the contained object.
- template <typename _ValueType, typename _Tp = _Decay<_ValueType>,
- typename _Mgr = _Manager<_Tp>,
- __any_constructible_t<_Tp, _ValueType&&> = true,
- enable_if_t<!__is_in_place_type<_Tp>::value, bool> = true>
- any(_ValueType&& __value)
+ template <typename _Tp, typename _VTp = _Decay<_Tp>,
+ typename _Mgr = _Manager<_VTp>,
+ enable_if_t<is_copy_constructible<_VTp>::value &&
+ !__is_in_place_type<_VTp>::value, bool> = true>
+ any(_Tp&& __value)
: _M_manager(&_Mgr::_S_manage)
{
- _Mgr::_S_create(_M_storage, std::forward<_ValueType>(__value));
- }
-
- /// Construct with a copy of @p __value as the contained object.
- template <typename _ValueType, typename _Tp = _Decay<_ValueType>,
- typename _Mgr = _Manager<_Tp>,
- enable_if_t<__and_v<is_copy_constructible<_Tp>,
- __not_<is_constructible<_Tp, _ValueType&&>>,
- __not_<__is_in_place_type<_Tp>>>,
- bool> = false>
- any(_ValueType&& __value)
- : _M_manager(&_Mgr::_S_manage)
- {
- _Mgr::_S_create(_M_storage, __value);
+ _Mgr::_S_create(_M_storage, std::forward<_Tp>(__value));
}
/// Construct with an object created from @p __args as the
contained object.
Thanks for the patch, the changes look great ... but the patch is
completely mangled by being pasted into the email body.
You should send patches as attachments so gmail doesn't replace tabs
with spaces and break lines (like the comment line above), preventing
the patch from applying.
But I can't use the patch anyway, as you don't have a copyright
assignment for GCC. Would yo be willing to complete an assignment?
See https://gcc.gnu.org/contribute.html#legal for details.
Anyway, that aside ...
diff --git a/libstdc++-v3/testsuite/20_util/any/misc/92156.cc
b/libstdc++-v3/testsuite/20_util/any/misc/92156.cc
new file mode 100644
index 00000000000..df6c9deff1b
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/any/misc/92156.cc
@@ -0,0 +1,39 @@
+// { dg-options "-std=gnu++17" }
+// { dg-do compile }
This dg-do directive means the test is only compiled, not executed.
It should also use an effective-target of c++17 to indicate it isn't
valid for earlier standards:
// { dg-do run { target c++17 } }
+// Copyright (C) 2014-2020 Free Software Foundation, Inc.
As this is a new test its copyright date should be 2020 only.
+//
+// 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 copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <any>
+#include <utility>
+#include <tuple>
+#include <type_traits>
+#include <testsuite_hooks.h>
+
+
+int main() {
+ auto a = std::any(std::in_place_type<std::any>, 5);
+ VERIFY(std::any_cast<int>(a) == 5);
This test cannot possibly pass. It will throw an exception, because
the type used in the any_cast is not the type of the contained value.
+ auto b = std::any(std::in_place_type<std::any>, {1});
+ VERIFY(std::any_cast<int>(b) == 1);
Same here.
+ std::any p = std::pair<std::any, std::any>(1, 1);
+ VERIFY((std::any_cast<std::pair<int,int>>(p) == std::pair<int,int>(1,1)));
And here.
+ std::any t = std::tuple<std::any>(1);
+ VERIFY((std::any_cast<std::tuple<int>>(t) == std::tuple<int>(1)));
And here.
So if I change the test from { dg-do compile } to { dg-do run } I get:
terminate called after throwing an instance of 'std::bad_any_cast'
what(): bad any_cast
FAIL: 20_util/any/misc/92156.cc execution test
And I also get these because the line numbers have changed (which is
easy to fix):
FAIL: 20_util/any/misc/any_cast_neg.cc (test for errors, line 461)
FAIL: 20_util/any/misc/any_cast_neg.cc (test for errors, line 457)
FAIL: 20_util/any/misc/any_cast_neg.cc (test for errors, line 483)
FAIL: 20_util/any/misc/any_cast_neg.cc (test for errors, line 501)
FAIL: 20_util/any/misc/any_cast_neg.cc (test for errors, line 497)
FAIL: 20_util/any/misc/any_cast_neg.cc (test for excess errors)
Was the patch properly tested?
