maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Lex] Support more type-traits in __has_feature 

It looks like we forgot to update the __has_feature support when we
added some of the type traits.

llvm-svn: 270580
This commit is contained in:
David Majnemer 2016-05-24 16:53:13 +00:00
parent 929ebf5a54
commit 2ffff19134
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clang/lib/Lex/PPMacroExpansion.cpp
View File

@ -1191,8 +1191,10 @@ static bool HasFeature(const Preprocessor &PP, StringRef Feature) {
.Case("has_nothrow_copy", LangOpts.CPlusPlus)
.Case("has_nothrow_constructor", LangOpts.CPlusPlus)
.Case("has_trivial_assign", LangOpts.CPlusPlus)
.Case("has_trivial_move_assign", LangOpts.CPlusPlus)
.Case("has_trivial_copy", LangOpts.CPlusPlus)
.Case("has_trivial_constructor", LangOpts.CPlusPlus)
.Case("has_trivial_move_constructor", LangOpts.CPlusPlus)
.Case("has_trivial_destructor", LangOpts.CPlusPlus)
.Case("has_virtual_destructor", LangOpts.CPlusPlus)
.Case("is_abstract", LangOpts.CPlusPlus)
@ -1201,14 +1203,21 @@ static bool HasFeature(const Preprocessor &PP, StringRef Feature) {
.Case("is_class", LangOpts.CPlusPlus)
.Case("is_constructible", LangOpts.CPlusPlus)
.Case("is_convertible_to", LangOpts.CPlusPlus)
.Case("is_destructible",
LangOpts.CPlusPlus &&LangOpts.MicrosoftExt)
.Case("is_empty", LangOpts.CPlusPlus)
.Case("is_enum", LangOpts.CPlusPlus)
.Case("is_final", LangOpts.CPlusPlus)
.Case("is_literal", LangOpts.CPlusPlus)
.Case("is_standard_layout", LangOpts.CPlusPlus)
.Case("is_nothrow_assignable", LangOpts.CPlusPlus)
.Case("is_nothrow_constructible", LangOpts.CPlusPlus)
.Case("is_nothrow_destructible",
LangOpts.CPlusPlus && LangOpts.MicrosoftExt)
.Case("is_pod", LangOpts.CPlusPlus)
.Case("is_polymorphic", LangOpts.CPlusPlus)
.Case("is_sealed", LangOpts.MicrosoftExt)
.Case("is_sealed",
LangOpts.CPlusPlus && LangOpts.MicrosoftExt)
.Case("is_standard_layout", LangOpts.CPlusPlus)
.Case("is_trivial", LangOpts.CPlusPlus)
.Case("is_trivially_assignable", LangOpts.CPlusPlus)
.Case("is_trivially_constructible", LangOpts.CPlusPlus)

20
clang/test/Lexer/has_feature_type_traits.cpp
View File

@ -20,6 +20,16 @@ int has_trivial_assign();
#endif
// CHECK: int has_trivial_assign();
#if __has_feature(has_trivial_move_assign)
int has_trivial_move_assign();
#endif
// CHECK: int has_trivial_move_assign();
#if __has_feature(has_trivial_move_constructor)
int has_trivial_move_constructor();
#endif
// CHECK: int has_trivial_move_constructor();
#if __has_feature(has_trivial_copy)
int has_trivial_copy();
#endif
@ -105,6 +115,16 @@ int is_literal();
#endif
// CHECK: int is_literal();
#if __has_feature(is_nothrow_assignable)
int is_nothrow_assignable();
#endif
// CHECK: int is_nothrow_assignable();
#if __has_feature(is_nothrow_constructible)
int is_nothrow_constructible();
#endif
// CHECK: int is_nothrow_constructible();
#if __has_feature(is_standard_layout)
int is_standard_layout();
#endif