OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c-common.c (c_common_reswords): Add __is_literal_type. 

gcc/c-family/
	* c-common.c (c_common_reswords): Add __is_literal_type.
	* c-common.h (enum rid): Add RID_IS_LITERAL_TYPE.
gcc/cp/
	* cp-tree.h (cp_trait_kind): Add CPTK_IS_LITERAL_TYPE.
	* cxx-pretty-print.c (pp_cxx_trait_expression): Handle it.
	* semantics.c (trait_expr_value, finish_trait_expr): Likewise.
	* parser.c (cp_parser_primary_expression): Handle RID_IS_LITERAL_TYPE.
	(cp_parser_trait_expr): Likewise.
libstdc++-v3/
	* include/std/type_traits (is_literal_type): New.

From-SVN: r166020
This commit is contained in:
Jason Merrill 2010-10-27 17:43:33 -04:00 committed by Jason Merrill
parent 81f0bab25e
commit 2b08f2c561
15 changed files with 86 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/c-family/ChangeLog
View File

@ -1,5 +1,8 @@
2010-10-27 Jason Merrill <jason@redhat.com>
* c-common.c (c_common_reswords): Add __is_literal_type.
* c-common.h (enum rid): Add RID_IS_LITERAL_TYPE.
* c-common.c (check_case_value): Remove special C++ code.
2010-10-27 Nicola Pero <nicola.pero@meta-innovation.com>

1
gcc/c-family/c-common.c
View File

@ -439,6 +439,7 @@ const struct c_common_resword c_common_reswords[] =
{ "__is_standard_layout", RID_IS_STD_LAYOUT, D_CXXONLY },
{ "__is_trivial", RID_IS_TRIVIAL, D_CXXONLY },
{ "__is_union", RID_IS_UNION, D_CXXONLY },
{ "__is_literal_type", RID_IS_LITERAL_TYPE, D_CXXONLY },
{ "__imag", RID_IMAGPART, 0 },
{ "__imag__", RID_IMAGPART, 0 },
{ "__inline", RID_INLINE, 0 },

2
gcc/c-family/c-common.h
View File

@ -140,7 +140,7 @@ enum rid
RID_IS_EMPTY, RID_IS_ENUM,
RID_IS_POD, RID_IS_POLYMORPHIC,
RID_IS_STD_LAYOUT, RID_IS_TRIVIAL,
RID_IS_UNION,
RID_IS_UNION, RID_IS_LITERAL_TYPE,
/* C++0x */
RID_CONSTEXPR, RID_DECLTYPE, RID_NOEXCEPT, RID_NULLPTR, RID_STATIC_ASSERT,

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2010-10-27 Jason Merrill <jason@redhat.com>
* cp-tree.h (cp_trait_kind): Add CPTK_IS_LITERAL_TYPE.
* cxx-pretty-print.c (pp_cxx_trait_expression): Handle it.
* semantics.c (trait_expr_value, finish_trait_expr): Likewise.
* parser.c (cp_parser_primary_expression): Handle RID_IS_LITERAL_TYPE.
(cp_parser_trait_expr): Likewise.
2010-10-27 Gabriel Dos Reis <gdr@cse.tamu.edu>
Jason Merrill <jason@redhat.com>

1
gcc/cp/cp-tree.h
View File

@ -567,6 +567,7 @@ typedef enum cp_trait_kind
CPTK_IS_POLYMORPHIC,
CPTK_IS_STD_LAYOUT,
CPTK_IS_TRIVIAL,
CPTK_IS_LITERAL_TYPE,
CPTK_IS_UNION
} cp_trait_kind;

3
gcc/cp/cxx-pretty-print.c
View File

@ -2369,6 +2369,9 @@ pp_cxx_trait_expression (cxx_pretty_printer *pp, tree t)
case CPTK_IS_UNION:
pp_cxx_ws_string (pp, "__is_union");
break;
case CPTK_IS_LITERAL_TYPE:
pp_cxx_ws_string (pp, "__is_literal_type");
break;
default:
gcc_unreachable ();

4
gcc/cp/parser.c
View File

@ -3814,6 +3814,7 @@ cp_parser_primary_expression (cp_parser *parser,
case RID_IS_STD_LAYOUT:
case RID_IS_TRIVIAL:
case RID_IS_UNION:
case RID_IS_LITERAL_TYPE:
return cp_parser_trait_expr (parser, token->keyword);
/* Objective-C++ expressions. */
@ -7365,6 +7366,9 @@ cp_parser_trait_expr (cp_parser* parser, enum rid keyword)
case RID_IS_UNION:
kind = CPTK_IS_UNION;
break;
case RID_IS_LITERAL_TYPE:
kind = CPTK_IS_LITERAL_TYPE;
break;
default:
gcc_unreachable ();
}

5
gcc/cp/semantics.c
View File

@ -5104,6 +5104,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_UNION:
return (type_code1 == UNION_TYPE);
case CPTK_IS_LITERAL_TYPE:
return (literal_type_p (type1));
default:
gcc_unreachable ();
return false;
@ -5152,6 +5155,7 @@ finish_trait_expr (cp_trait_kind kind, tree type1, tree type2)
|| kind == CPTK_IS_POLYMORPHIC
|| kind == CPTK_IS_STD_LAYOUT
|| kind == CPTK_IS_TRIVIAL
|| kind == CPTK_IS_LITERAL_TYPE
|| kind == CPTK_IS_UNION);
if (kind == CPTK_IS_CONVERTIBLE_TO)
@ -5195,6 +5199,7 @@ finish_trait_expr (cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_POLYMORPHIC:
case CPTK_IS_STD_LAYOUT:
case CPTK_IS_TRIVIAL:
case CPTK_IS_LITERAL_TYPE:
if (!check_trait_type (type1))
{
error ("incomplete type %qT not allowed", type1);

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2010-10-27 Jason Merrill <jason@redhat.com>
* g++.dg/cpp0x/constexpr-is_literal.C: New.
2010-10-27 Janus Weil <janus@gcc.gnu.org>
PR fortran/46161

38
gcc/testsuite/g++.dg/cpp0x/constexpr-is_literal.C Normal file
View File

@ -0,0 +1,38 @@
// { dg-options -std=c++0x }
#include <type_traits>
#define IS_LIT(T) (std::is_literal_type<T>::value)
#define SA(X) static_assert (X, #X)
#define YES(T) SA(IS_LIT(T))
#define NO(T) SA(!IS_LIT(T))
enum E1 { };
enum class E2 { };
struct Literal {};
struct NotLiteral {
~NotLiteral();
};
YES(int);
YES(int[]);
YES(int[3]);
YES(double);
YES(void *);
YES(decltype (nullptr));
YES(int Literal::*);
YES(void (Literal::*)());
YES(E1);
YES(E2);
YES(Literal);
NO (NotLiteral);
YES(NotLiteral *);
YES(NotLiteral NotLiteral::*);
YES(NotLiteral (NotLiteral::*)(NotLiteral));
struct A {
A(const A&) = default;
};
NO(A); // no constexpr ctor other than copy

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2010-10-27 Jason Merrill <jason@redhat.com>
* include/std/type_traits (is_literal_type): New.
* testsuite/20_util/declval/requirements/1_neg.cc: Adjust.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Adjust.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Adjust.
2010-10-26 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/lib/libstdc++.exp ([check_v3_target_normal_mode]): Add.

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

@ -192,6 +192,12 @@ namespace std
: public integral_constant<bool, __is_pod(_Tp)>
{ };
/// is_literal_type
template<typename _Tp>
struct is_literal_type
: public integral_constant<bool, __is_literal_type(_Tp)>
{ };
template<typename _Tp>
typename add_rvalue_reference<_Tp>::type declval() noexcept;

2
libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc
View File

@ -19,7 +19,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-error "static assertion failed" "" { target *-*-* } 682 }
// { dg-error "static assertion failed" "" { target *-*-* } 688 }
#include <utility>

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

@ -48,5 +48,5 @@ void test01()
// { dg-error "instantiated from here" "" { target *-*-* } 40 }
// { dg-error "instantiated from here" "" { target *-*-* } 42 }
// { dg-error "invalid use of incomplete type" "" { target *-*-* } 645 }
// { dg-error "declaration of" "" { target *-*-* } 609 }
// { dg-error "invalid use of incomplete type" "" { target *-*-* } 651 }
// { dg-error "declaration of" "" { target *-*-* } 615 }

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

@ -48,5 +48,5 @@ void test01()
// { dg-error "instantiated from here" "" { target *-*-* } 40 }
// { dg-error "instantiated from here" "" { target *-*-* } 42 }
// { dg-error "invalid use of incomplete type" "" { target *-*-* } 568 }
// { dg-error "declaration of" "" { target *-*-* } 532 }
// { dg-error "invalid use of incomplete type" "" { target *-*-* } 574 }
// { dg-error "declaration of" "" { target *-*-* } 538 }