From a0230468417e750d1ae805ac38001aa88099d7fd Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Mon, 1 Sep 2008 23:24:09 +0000 Subject: [PATCH] type_traits (__make_unsigned_selector<>): Consider enums of size smaller than short. * include/std/type_traits (__make_unsigned_selector<>): Consider enums of size smaller than short. (__make_signed_selector<>): Likewise. * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Adjust line numbers. * testsuite/20_util/make_usigned/requirements/typedefs_neg.cc: Adjust line numbers. * testsuite/20_util/make_signed/requirements/typedefs-2.cc: Ensure test_enum is the same size as short. * testsuite/20_util/make_unsigned/requirements/typedefs-2.cc: Ensure test_enum is the same size as short. From-SVN: r139875 --- libstdc++-v3/ChangeLog | 14 +++++++++ libstdc++-v3/include/std/type_traits | 30 +++++++++++-------- .../make_signed/requirements/typedefs-2.cc | 3 +- .../make_signed/requirements/typedefs_neg.cc | 4 +-- .../make_unsigned/requirements/typedefs-2.cc | 3 +- .../requirements/typedefs_neg.cc | 2 +- 6 files changed, 39 insertions(+), 17 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 29adf70c41f..0b2f5b94d63 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2008-09-01 Mark Mitchell + + * include/std/type_traits (__make_unsigned_selector<>): Consider + enums of size smaller than short. + (__make_signed_selector<>): Likewise. + * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: + Adjust line numbers. + * testsuite/20_util/make_usigned/requirements/typedefs_neg.cc: + Adjust line numbers. + * testsuite/20_util/make_signed/requirements/typedefs-2.cc: + Ensure test_enum is the same size as short. + * testsuite/20_util/make_unsigned/requirements/typedefs-2.cc: + Ensure test_enum is the same size as short. + 2008-08-31 Aaron W. LaFramboise * acinclude.m4 : Don't use symvers on Windows. diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 1a759187955..87fdff146bc 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -455,15 +455,18 @@ namespace std struct __make_unsigned_selector<_Tp, false, true> { private: - // GNU enums start with sizeof short. - typedef unsigned short __smallest; - static const bool __b1 = sizeof(_Tp) <= sizeof(__smallest); + // With -fshort-enums, an enum may be as small as a char. + typedef unsigned char __smallest; + static const bool __b0 = sizeof(_Tp) <= sizeof(__smallest); + static const bool __b1 = sizeof(_Tp) <= sizeof(unsigned short); static const bool __b2 = sizeof(_Tp) <= sizeof(unsigned int); - typedef conditional<__b2, unsigned int, unsigned long> __cond; - typedef typename __cond::type __cond_type; + typedef conditional<__b2, unsigned int, unsigned long> __cond2; + typedef typename __cond2::type __cond2_type; + typedef conditional<__b1, unsigned short, __cond2_type> __cond1; + typedef typename __cond1::type __cond1_type; public: - typedef typename conditional<__b1, __smallest, __cond_type>::type __type; + typedef typename conditional<__b0, __smallest, __cond1_type>::type __type; }; // Given an integral/enum type, return the corresponding unsigned @@ -530,15 +533,18 @@ namespace std struct __make_signed_selector<_Tp, false, true> { private: - // GNU enums start with sizeof short. - typedef signed short __smallest; - static const bool __b1 = sizeof(_Tp) <= sizeof(__smallest); + // With -fshort-enums, an enum may be as small as a char. + typedef signed char __smallest; + static const bool __b0 = sizeof(_Tp) <= sizeof(__smallest); + static const bool __b1 = sizeof(_Tp) <= sizeof(signed short); static const bool __b2 = sizeof(_Tp) <= sizeof(signed int); - typedef conditional<__b2, signed int, signed long> __cond; - typedef typename __cond::type __cond_type; + typedef conditional<__b2, signed int, signed long> __cond2; + typedef typename __cond2::type __cond2_type; + typedef conditional<__b1, signed short, __cond2_type> __cond1; + typedef typename __cond1::type __cond1_type; public: - typedef typename conditional<__b1, __smallest, __cond_type>::type __type; + typedef typename conditional<__b0, __smallest, __cond1_type>::type __type; }; // Given an integral/enum type, return the corresponding signed diff --git a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc index ea4de372296..b0f93b08293 100644 --- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc +++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc @@ -24,7 +24,8 @@ #include #include -enum test_enum { first_selection }; +// Ensure that this enum has "short" as its underlying type. +enum test_enum { first_selection = ((unsigned char)-1) + 1 }; void test01() { diff --git a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc index dc33931a665..59f679801c0 100644 --- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc +++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc @@ -49,8 +49,8 @@ void test01() // { dg-error "instantiated from here" "" { target *-*-* } 41 } // { dg-error "instantiated from here" "" { target *-*-* } 43 } -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 549 } -// { dg-error "declaration of" "" { target *-*-* } 515 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 555 } +// { dg-error "declaration of" "" { target *-*-* } 518 } // { dg-excess-errors "At global scope" } // { dg-excess-errors "In instantiation of" } diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc index ce318c8a4c2..4f6412090ca 100644 --- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc +++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc @@ -24,7 +24,8 @@ #include #include -enum test_enum { first_selection }; +// Ensure that this enum has "short" as its underlying type. +enum test_enum { first_selection = ((unsigned char)-1) + 1 }; void test01() { diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc index 0b02e3345f6..170183dd868 100644 --- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc +++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc @@ -49,7 +49,7 @@ void test01() // { dg-error "instantiated from here" "" { target *-*-* } 41 } // { dg-error "instantiated from here" "" { target *-*-* } 43 } -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 474 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 477 } // { dg-error "declaration of" "" { target *-*-* } 440 } // { dg-excess-errors "At global scope" }