diff options
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 6 | ||||
| -rw-r--r-- | test/Lexer/has_feature_rtti.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index 8ec8b9bab8..6181e17e60 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -483,12 +483,12 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) { switch (II->getLength()) { default: return false; - case 4: - if (II->isStr("rtti")) return LangOpts.RTTI; - return false; case 6: if (II->isStr("blocks")) return LangOpts.Blocks; return false; + case 8: + if (II->isStr("cxx_rtti")) return LangOpts.RTTI; + return false; case 19: if (II->isStr("objc_nonfragile_abi")) return LangOpts.ObjCNonFragileABI; return false; diff --git a/test/Lexer/has_feature_rtti.cpp b/test/Lexer/has_feature_rtti.cpp index 05bbd8860f..cc01f61cba 100644 --- a/test/Lexer/has_feature_rtti.cpp +++ b/test/Lexer/has_feature_rtti.cpp @@ -1,7 +1,7 @@ // RUN: clang -E -frtti %s -o - | FileCheck --check-prefix=CHECK-RTTI %s // RUN: clang -E -fno-rtti %s -o - | FileCheck --check-prefix=CHECK-NO-RTTI %s -#if __has_feature(rtti) +#if __has_feature(cxx_rtti) int foo(); #else int bar(); |