diff options
6 files changed, 1 insertions, 30 deletions
diff --git a/clang/docs/Modules.rst b/clang/docs/Modules.rst index b8841c0a5ce..2b1bde2fedc 100644 --- a/clang/docs/Modules.rst +++ b/clang/docs/Modules.rst @@ -413,9 +413,6 @@ altivec blocks The "blocks" language feature is available. -coroutines - Support for the coroutines TS is available. - cplusplus C++ support is available. diff --git a/clang/lib/Basic/Module.cpp b/clang/lib/Basic/Module.cpp index ac3d7c55967..a6fd931cb17 100644 --- a/clang/lib/Basic/Module.cpp +++ b/clang/lib/Basic/Module.cpp @@ -64,7 +64,6 @@ static bool hasFeature(StringRef Feature, const LangOptions &LangOpts, bool HasFeature = llvm::StringSwitch<bool>(Feature) .Case("altivec", LangOpts.AltiVec) .Case("blocks", LangOpts.Blocks) - .Case("coroutines", LangOpts.CoroutinesTS) .Case("cplusplus", LangOpts.CPlusPlus) .Case("cplusplus11", LangOpts.CPlusPlus11) .Case("freestanding", LangOpts.Freestanding) diff --git a/clang/test/Modules/Inputs/DependsOnModule.framework/Headers/coroutines.h b/clang/test/Modules/Inputs/DependsOnModule.framework/Headers/coroutines.h deleted file mode 100644 index 85281f5a099..00000000000 --- a/clang/test/Modules/Inputs/DependsOnModule.framework/Headers/coroutines.h +++ /dev/null @@ -1,3 +0,0 @@ -#ifndef __cpp_coroutines -#error coroutines must be enabled -#endif diff --git a/clang/test/Modules/Inputs/DependsOnModule.framework/Headers/not_coroutines.h b/clang/test/Modules/Inputs/DependsOnModule.framework/Headers/not_coroutines.h deleted file mode 100644 index 9312b9ad892..00000000000 --- a/clang/test/Modules/Inputs/DependsOnModule.framework/Headers/not_coroutines.h +++ /dev/null @@ -1,3 +0,0 @@ -#ifdef __cpp_coroutines -#error coroutines must NOT be enabled -#endif diff --git a/clang/test/Modules/Inputs/DependsOnModule.framework/module.map b/clang/test/Modules/Inputs/DependsOnModule.framework/module.map index 4d468f2a8c0..b62308583df 100644 --- a/clang/test/Modules/Inputs/DependsOnModule.framework/module.map +++ b/clang/test/Modules/Inputs/DependsOnModule.framework/module.map @@ -22,14 +22,7 @@ framework module DependsOnModule { explicit module CustomReq2 { requires custom_req2 } - explicit module Coroutines { - requires coroutines - header "coroutines.h" - } - explicit module NotCoroutines { - requires !coroutines - header "not_coroutines.h" - } + explicit framework module SubFramework { umbrella header "SubFramework.h" diff --git a/clang/test/Modules/requires-coroutines.mm b/clang/test/Modules/requires-coroutines.mm deleted file mode 100644 index d3519cd2bba..00000000000 --- a/clang/test/Modules/requires-coroutines.mm +++ /dev/null @@ -1,12 +0,0 @@ -// RUN: rm -rf %t -// RUN: %clang_cc1 -Wauto-import -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -F %S/Inputs %s -verify -// RUN: %clang_cc1 -Wauto-import -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -F %S/Inputs %s -verify -fcoroutines-ts -DCOROUTINES - - -#ifdef COROUTINES -@import DependsOnModule.Coroutines; -@import DependsOnModule.NotCoroutines; // expected-error {{module 'DependsOnModule.NotCoroutines' is incompatible with feature 'coroutines'}} -#else -@import DependsOnModule.NotCoroutines; -@import DependsOnModule.Coroutines; // expected-error {{module 'DependsOnModule.Coroutines' requires feature 'coroutines'}} -#endif |
