diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2016-05-24 16:53:13 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2016-05-24 16:53:13 +0000 |
| commit | 2ffff19134b9d74a4892018309d8f59176218a72 (patch) | |
| tree | bb482559d0f384d50bb4836a38d34c2ffccfd459 /clang | |
| parent | 929ebf5a54801008daee01ca1e25b9daf7118b69 (diff) | |
| download | bcm5719-llvm-2ffff19134b9d74a4892018309d8f59176218a72.tar.gz bcm5719-llvm-2ffff19134b9d74a4892018309d8f59176218a72.zip | |
[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
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Lex/PPMacroExpansion.cpp | 13 | ||||
| -rw-r--r-- | clang/test/Lexer/has_feature_type_traits.cpp | 20 |
2 files changed, 31 insertions, 2 deletions
diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp index 79ca9ebb706..130744fe2b1 100644 --- a/clang/lib/Lex/PPMacroExpansion.cpp +++ b/clang/lib/Lex/PPMacroExpansion.cpp @@ -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) diff --git a/clang/test/Lexer/has_feature_type_traits.cpp b/clang/test/Lexer/has_feature_type_traits.cpp index 6636e7b3963..743d2e24ab0 100644 --- a/clang/test/Lexer/has_feature_type_traits.cpp +++ b/clang/test/Lexer/has_feature_type_traits.cpp @@ -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 |
