git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR libstdc++/86398 fix std::is_trivially_constructible regression 

The intrinsic doesn't check for allowed conversions between scalar
types, so restore the std::is_constructible check.

Also make some trivial whitespace changes.

	PR libstdc++/86398
	* include/std/type_traits (is_trivially_constructible): Check
	is_constructible before __is_trivially_constructible.
	* testsuite/20_util/is_trivially_constructible/value.cc: Add more
	tests, including negative cases.
	* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Use
	zero for dg-error lineno.
	* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
	Likewise.

From-SVN: r262379
This commit is contained in:
Jonathan Wakely 2018-07-04 10:03:18 +01:00 committed by Jonathan Wakely
parent 90fc44ecfa
commit e9029d55f2
5 changed files with 100 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,15 @@
2018-07-04 Jonathan Wakely <jwakely@redhat.com> 2018-07-04 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/86398
* include/std/type_traits (is_trivially_constructible): Check
is_constructible before __is_trivially_constructible.
* testsuite/20_util/is_trivially_constructible/value.cc: Add more
tests, including negative cases.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Use
zero for dg-error lineno.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
Likewise.
* include/std/bit (__rotl, __rotr): Avoid branch. * include/std/bit (__rotl, __rotr): Avoid branch.
(_If_is_unsigned_integer): Use remove_cv_t. (_If_is_unsigned_integer): Use remove_cv_t.
* testsuite/26_numerics/bit/bitops.count/popcount.cc: New. * testsuite/26_numerics/bit/bitops.count/popcount.cc: New.

21
libstdc++-v3/include/std/type_traits
View File

@ -1136,7 +1136,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// is_trivially_constructible /// is_trivially_constructible
template<typename _Tp, typename... _Args> template<typename _Tp, typename... _Args>
struct is_trivially_constructible struct is_trivially_constructible
: public __bool_constant<__is_trivially_constructible(_Tp, _Args...)> : public __and_<is_constructible<_Tp, _Args...>, __bool_constant<
__is_trivially_constructible(_Tp, _Args...)>>::type
{ }; { };
/// is_trivially_default_constructible /// is_trivially_default_constructible
@ -1159,21 +1160,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp> template<typename _Tp>
struct __is_implicitly_default_constructible_impl struct __is_implicitly_default_constructible_impl
: public __do_is_implicitly_default_constructible_impl : public __do_is_implicitly_default_constructible_impl
{ {
typedef decltype(__test(declval<_Tp>())) type; typedef decltype(__test(declval<_Tp>())) type;
}; };
template<typename _Tp> template<typename _Tp>
struct __is_implicitly_default_constructible_safe struct __is_implicitly_default_constructible_safe
: public __is_implicitly_default_constructible_impl<_Tp>::type : public __is_implicitly_default_constructible_impl<_Tp>::type
{ }; { };
template <typename _Tp> template <typename _Tp>
struct __is_implicitly_default_constructible struct __is_implicitly_default_constructible
: public __and_<is_default_constructible<_Tp>, : public __and_<is_default_constructible<_Tp>,
__is_implicitly_default_constructible_safe<_Tp>> __is_implicitly_default_constructible_safe<_Tp>>
{ }; { };
/// is_trivially_copy_constructible /// is_trivially_copy_constructible

138
libstdc++-v3/testsuite/20_util/is_trivially_constructible/value.cc
View File

@ -44,124 +44,140 @@ void test01()
using std::is_trivially_constructible; using std::is_trivially_constructible;
using namespace __gnu_test; using namespace __gnu_test;
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
int>(true), ""); int>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
int, int>(true), ""); int, int>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
int, int&>(true), ""); int, int&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
int, int&&>(true), ""); int, int&&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
int, const int&>(true), ""); int, const int&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
int, void*>(false), "PR 86398");
static_assert(test_property<is_trivially_constructible,
int, int*>(false), "PR 86398");
static_assert(test_property<is_trivially_constructible,
int, const int*>(false), "PR 86398");
static_assert(test_property<is_trivially_constructible,
int*, void*>(false), "PR 86398");
static_assert(test_property<is_trivially_constructible,
int*, const int*>(false), "PR 86398");
static_assert(test_property<is_trivially_constructible,
int&, const int>(false), "");
static_assert(test_property<is_trivially_constructible,
const int&, int>(true), "");
static_assert(test_property<is_trivially_constructible,
const int&, int&>(true), "");
static_assert(test_property<is_trivially_constructible,
const int*, int*>(true), "");
static_assert(test_property<is_trivially_constructible,
PolymorphicClass>(false), ""); PolymorphicClass>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
PolymorphicClass, PolymorphicClass>(false), ""); PolymorphicClass, PolymorphicClass>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
PolymorphicClass, PolymorphicClass&>(false), ""); PolymorphicClass, PolymorphicClass&>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
PolymorphicClass, PolymorphicClass&&>(false), ""); PolymorphicClass, PolymorphicClass&&>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
PolymorphicClass, const PolymorphicClass&>(false), ""); PolymorphicClass, const PolymorphicClass&>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
TType>(true), ""); TType>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
TType, TType>(true), ""); TType, TType>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
TType, TType&>(true), ""); TType, TType&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
TType, TType&&>(true), ""); TType, TType&&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
TType, const TType&>(true), ""); TType, const TType&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
TType, int, int>(false), ""); TType, int, int>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
PODType>(true), ""); PODType>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
PODType, PODType>(true), ""); PODType, PODType>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
PODType, PODType&>(true), ""); PODType, PODType&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
PODType, PODType&&>(true), ""); PODType, PODType&&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
PODType, const PODType&>(true), ""); PODType, const PODType&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
PODType, int, int>(false), ""); PODType, int, int>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
NType>(false), ""); NType>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
SLType>(false), ""); SLType>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
LType>(false), ""); LType>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
LType, int>(false), ""); LType, int>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
construct::DelDef>(false), ""); construct::DelDef>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
construct::Abstract>(false), ""); construct::Abstract>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
construct::Ellipsis>(false), ""); construct::Ellipsis>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
construct::DelEllipsis>(false), ""); construct::DelEllipsis>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
construct::Any>(false), ""); construct::Any>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
construct::DelCopy>(false), ""); construct::DelCopy>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
construct::DelCopy, const construct::DelCopy&>(false), ""); construct::DelCopy, const construct::DelCopy&>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
construct::DelDtor>(false), ""); construct::DelDtor>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
construct::Nontrivial>(false), ""); construct::Nontrivial>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
construct::UnusualCopy>(false), ""); construct::UnusualCopy>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
CopyConsOnlyType>(false), ""); CopyConsOnlyType>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
CopyConsOnlyType, CopyConsOnlyType>(false), ""); CopyConsOnlyType, CopyConsOnlyType>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
CopyConsOnlyType, CopyConsOnlyType&>(true), ""); CopyConsOnlyType, CopyConsOnlyType&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
CopyConsOnlyType, CopyConsOnlyType&&>(false), ""); CopyConsOnlyType, CopyConsOnlyType&&>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
CopyConsOnlyType, const CopyConsOnlyType&>(true), ""); CopyConsOnlyType, const CopyConsOnlyType&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
MoveConsOnlyType>(false), ""); MoveConsOnlyType>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
MoveConsOnlyType, MoveConsOnlyType>(true), ""); MoveConsOnlyType, MoveConsOnlyType>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
MoveConsOnlyType, MoveConsOnlyType&>(false), ""); MoveConsOnlyType, MoveConsOnlyType&>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
MoveConsOnlyType, MoveConsOnlyType&&>(true), ""); MoveConsOnlyType, MoveConsOnlyType&&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
MoveConsOnlyType, const MoveConsOnlyType&>(false), ""); MoveConsOnlyType, const MoveConsOnlyType&>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
ClassType, DerivedType>(true), ""); ClassType, DerivedType>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
ClassType, DerivedType&>(true), ""); ClassType, DerivedType&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
ClassType, DerivedType&&>(true), ""); ClassType, DerivedType&&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
ClassType, const DerivedType&>(true), ""); ClassType, const DerivedType&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
HasTemplateCCtor>(false), ""); HasTemplateCCtor>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
HasTemplateCCtor, HasTemplateCCtor>(false), ""); HasTemplateCCtor, HasTemplateCCtor>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
HasTemplateCCtor, const HasTemplateCCtor&>(true), ""); HasTemplateCCtor, const HasTemplateCCtor&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
MoveOnly>(false), ""); MoveOnly>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
MoveOnly, MoveOnly>(true), ""); MoveOnly, MoveOnly>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
MoveOnly, MoveOnly&>(false), ""); MoveOnly, MoveOnly&>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
MoveOnly, MoveOnly&&>(true), ""); MoveOnly, MoveOnly&&>(true), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
MoveOnly, const MoveOnly&>(false), ""); MoveOnly, const MoveOnly&>(false), "");
static_assert(test_property<is_trivially_constructible, static_assert(test_property<is_trivially_constructible,
MoveOnly2>(false), ""); MoveOnly2>(false), "");
} }

2
libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc
View File

@ -47,4 +47,4 @@ void test01()
// { dg-error "required from here" "" { target *-*-* } 39 } // { dg-error "required from here" "" { target *-*-* } 39 }
// { dg-error "required from here" "" { target *-*-* } 41 } // { dg-error "required from here" "" { target *-*-* } 41 }
// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1825 } // { dg-error "invalid use of incomplete type" "" { target *-*-* } 0 }

3
libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc
View File

@ -47,5 +47,4 @@ void test01()
// { dg-error "required from here" "" { target *-*-* } 39 } // { dg-error "required from here" "" { target *-*-* } 39 }
// { dg-error "required from here" "" { target *-*-* } 41 } // { dg-error "required from here" "" { target *-*-* } 41 }
// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1708 } // { dg-error "invalid use of incomplete type" "" { target *-*-* } 0 }