diff options
| -rw-r--r-- | clang/docs/Modules.rst | 15 | ||||
| -rw-r--r-- | clang/lib/Basic/Module.cpp | 5 | ||||
| -rw-r--r-- | clang/test/Modules/Inputs/DependsOnModule.framework/module.map | 18 | ||||
| -rw-r--r-- | clang/test/Modules/requires.m | 17 |
4 files changed, 54 insertions, 1 deletions
diff --git a/clang/docs/Modules.rst b/clang/docs/Modules.rst index 2fa38be6f49..493c54d3913 100644 --- a/clang/docs/Modules.rst +++ b/clang/docs/Modules.rst @@ -430,6 +430,21 @@ cplusplus cplusplus11 C++11 support is available. +cplusplus14 + C++14 support is available. + +cplusplus17 + C++17 support is available. + +c99 + C99 support is available. + +c11 + C11 support is available. + +c17 + C17 support is available. + freestanding A freestanding environment is available. diff --git a/clang/lib/Basic/Module.cpp b/clang/lib/Basic/Module.cpp index 692e138f6c1..c990b27941a 100644 --- a/clang/lib/Basic/Module.cpp +++ b/clang/lib/Basic/Module.cpp @@ -78,6 +78,11 @@ static bool hasFeature(StringRef Feature, const LangOptions &LangOpts, .Case("coroutines", LangOpts.CoroutinesTS) .Case("cplusplus", LangOpts.CPlusPlus) .Case("cplusplus11", LangOpts.CPlusPlus11) + .Case("cplusplus14", LangOpts.CPlusPlus14) + .Case("cplusplus17", LangOpts.CPlusPlus17) + .Case("c99", LangOpts.C99) + .Case("c11", LangOpts.C11) + .Case("c17", LangOpts.C17) .Case("freestanding", LangOpts.Freestanding) .Case("gnuinlineasm", LangOpts.GNUAsm) .Case("objc", LangOpts.ObjC1) diff --git a/clang/test/Modules/Inputs/DependsOnModule.framework/module.map b/clang/test/Modules/Inputs/DependsOnModule.framework/module.map index 4d468f2a8c0..948a1efd743 100644 --- a/clang/test/Modules/Inputs/DependsOnModule.framework/module.map +++ b/clang/test/Modules/Inputs/DependsOnModule.framework/module.map @@ -37,4 +37,22 @@ framework module DependsOnModule { export * } } + explicit module CXX11 { + requires cplusplus11 + } + explicit module CXX14 { + requires cplusplus14 + } + explicit module CXX17 { + requires cplusplus17 + } + explicit module C99 { + requires c99 + } + explicit module C11 { + requires c11 + } + explicit module C17 { + requires c17 + } } diff --git a/clang/test/Modules/requires.m b/clang/test/Modules/requires.m index 4a83d0c2b0e..d8f54b49508 100644 --- a/clang/test/Modules/requires.m +++ b/clang/test/Modules/requires.m @@ -1,6 +1,7 @@ // RUN: rm -rf %t // RUN: %clang_cc1 -Wauto-import -Wno-private-module -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -F %S/Inputs -I %S/Inputs %s -verify -fmodule-feature custom_req1 - +// RUN: %clang_cc1 -Wauto-import -Wno-private-module -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -F %S/Inputs -I %S/Inputs %s -verify -std=c89 -DTEST_C_FEATURES +#ifndef TEST_C_FEATURES // expected-error@DependsOnModule.framework/module.map:7 {{module 'DependsOnModule.CXX' requires feature 'cplusplus'}} @import DependsOnModule.CXX; // expected-note {{module imported here}} @import DependsOnModule.NotCXX; @@ -15,3 +16,17 @@ @import RequiresWithMissingHeader.HeaderBefore; // expected-note {{module imported here}} // expected-error@module.map:* {{module 'RequiresWithMissingHeader.HeaderAfter' requires feature 'missing'}} @import RequiresWithMissingHeader.HeaderAfter; // expected-note {{module imported here}} +// expected-error@DependsOnModule.framework/module.map:40 {{module 'DependsOnModule.CXX11' requires feature 'cplusplus11'}} +@import DependsOnModule.CXX11; // expected-note {{module imported here}} +// expected-error@DependsOnModule.framework/module.map:43 {{module 'DependsOnModule.CXX14' requires feature 'cplusplus14'}} +@import DependsOnModule.CXX14; // expected-note {{module imported here}} +// expected-error@DependsOnModule.framework/module.map:46 {{module 'DependsOnModule.CXX17' requires feature 'cplusplus17'}} +@import DependsOnModule.CXX17; // expected-note {{module imported here}} +#else +// expected-error@DependsOnModule.framework/module.map:49 {{module 'DependsOnModule.C99' requires feature 'c99'}} +@import DependsOnModule.C99; // expected-note {{module imported here}} +// expected-error@DependsOnModule.framework/module.map:52 {{module 'DependsOnModule.C11' requires feature 'c11'}} +@import DependsOnModule.C11; // expected-note {{module imported here}} +// expected-error@DependsOnModule.framework/module.map:55 {{module 'DependsOnModule.C17' requires feature 'c17'}} +@import DependsOnModule.C17; // expected-note {{module imported here}} +#endif |
