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

Make __has_feature(nullability) and __has_extension(nullability) always true. 

These are _Underbar_capital-prefixed additions to the language that
shouldn't depend on language standard.

llvm-svn: 240976
This commit is contained in:
Douglas Gregor 2015-06-29 18:11:42 +00:00
parent 8fee84d01e
commit 4c27d104c6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1052,7 +1052,7 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) {
.Case("address_sanitizer", .Case("address_sanitizer",
LangOpts.Sanitize.hasOneOf(SanitizerKind::Address | LangOpts.Sanitize.hasOneOf(SanitizerKind::Address |
SanitizerKind::KernelAddress)) SanitizerKind::KernelAddress))
.Case("assume_nonnull", LangOpts.ObjC1 || LangOpts.GNUMode) .Case("assume_nonnull", true)
.Case("attribute_analyzer_noreturn", true) .Case("attribute_analyzer_noreturn", true)
.Case("attribute_availability", true) .Case("attribute_availability", true)
.Case("attribute_availability_with_message", true) .Case("attribute_availability_with_message", true)
@ -1077,7 +1077,7 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) {
.Case("cxx_exceptions", LangOpts.CXXExceptions) .Case("cxx_exceptions", LangOpts.CXXExceptions)
.Case("cxx_rtti", LangOpts.RTTI) .Case("cxx_rtti", LangOpts.RTTI)
.Case("enumerator_attributes", true) .Case("enumerator_attributes", true)
.Case("nullability", LangOpts.ObjC1 || LangOpts.GNUMode) .Case("nullability", true)
.Case("memory_sanitizer", LangOpts.Sanitize.has(SanitizerKind::Memory)) .Case("memory_sanitizer", LangOpts.Sanitize.has(SanitizerKind::Memory))
.Case("thread_sanitizer", LangOpts.Sanitize.has(SanitizerKind::Thread)) .Case("thread_sanitizer", LangOpts.Sanitize.has(SanitizerKind::Thread))
.Case("dataflow_sanitizer", LangOpts.Sanitize.has(SanitizerKind::DataFlow)) .Case("dataflow_sanitizer", LangOpts.Sanitize.has(SanitizerKind::DataFlow))
@ -1226,8 +1226,6 @@ static bool HasExtension(const Preprocessor &PP, const IdentifierInfo *II) {
// Because we inherit the feature list from HasFeature, this string switch // Because we inherit the feature list from HasFeature, this string switch
// must be less restrictive than HasFeature's. // must be less restrictive than HasFeature's.
return llvm::StringSwitch<bool>(Extension) return llvm::StringSwitch<bool>(Extension)
.Case("assume_nonnull", true)
.Case("nullability", true)
// C11 features supported by other languages as extensions. // C11 features supported by other languages as extensions.
.Case("c_alignas", true) .Case("c_alignas", true)
.Case("c_alignof", true) .Case("c_alignof", true)

5
clang/test/SemaCXX/nullability.cpp
View File

@ -1,5 +1,10 @@
// RUN: %clang_cc1 -std=c++11 -fsyntax-only -Wno-nullability-declspec %s -verify // RUN: %clang_cc1 -std=c++11 -fsyntax-only -Wno-nullability-declspec %s -verify
#if __has_feature(nullability)
#else
# error nullability feature should be defined
#endif
typedef decltype(nullptr) nullptr_t; typedef decltype(nullptr) nullptr_t;
class X { class X {