diff options
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 3 | ||||
| -rw-r--r-- | test/Lexer/has_feature_modules.m | 16 |
2 files changed, 17 insertions, 2 deletions
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index e93dc1560d..76962e4dd7 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -617,7 +617,7 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) { LangOpts.ObjCRuntimeHasWeak) .Case("objc_fixed_enum", LangOpts.ObjC2) .Case("objc_instancetype", LangOpts.ObjC2) - .Case("objc_modules", LangOpts.Modules) + .Case("objc_modules", LangOpts.ObjC2 && LangOpts.Modules) .Case("objc_nonfragile_abi", LangOpts.ObjCNonFragileABI) .Case("objc_weak_class", LangOpts.ObjCNonFragileABI) .Case("ownership_holds", true) @@ -698,6 +698,7 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) { .Case("is_trivial", LangOpts.CPlusPlus) .Case("is_trivially_copyable", LangOpts.CPlusPlus) .Case("is_union", LangOpts.CPlusPlus) + .Case("modules", LangOpts.Modules) .Case("tls", PP.getTargetInfo().isTLSSupported()) .Case("underlying_type", LangOpts.CPlusPlus) .Default(false); diff --git a/test/Lexer/has_feature_modules.m b/test/Lexer/has_feature_modules.m index ec4d507fcb..6cea324689 100644 --- a/test/Lexer/has_feature_modules.m +++ b/test/Lexer/has_feature_modules.m @@ -1,7 +1,12 @@ +// RUN: %clang_cc1 -E -fmodules %s -o - | FileCheck --check-prefix=CHECK-HAS-OBJC-MODULES %s +// RUN: %clang_cc1 -E %s -o - | FileCheck --check-prefix=CHECK-NO-OBJC-MODULES %s +// RUN: %clang_cc1 -E -x c -fmodules %s -o - | FileCheck --check-prefix=CHECK-NO-OBJC-MODULES %s + // RUN: %clang_cc1 -E -fmodules %s -o - | FileCheck --check-prefix=CHECK-HAS-MODULES %s // RUN: %clang_cc1 -E %s -o - | FileCheck --check-prefix=CHECK-NO-MODULES %s +// RUN: %clang_cc1 -E -x c -fmodules %s -o - | FileCheck --check-prefix=CHECK-HAS-MODULES %s -#if __has_feature(objc_modules) +#if __has_feature(modules) int has_modules(); #else int no_modules(); @@ -9,3 +14,12 @@ int no_modules(); // CHECK-HAS-MODULES: has_modules // CHECK-NO-MODULES: no_modules + +#if __has_feature(objc_modules) +int has_objc_modules(); +#else +int no_objc_modules(); +#endif + +// CHECK-HAS-OBJC-MODULES: has_objc_modules +// CHECK-NO-OBJC-MODULES: no_objc_modules |