Revert "[coroutines] Support "coroutines" feature in module map requires clause"

This reverts commit r304054.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@304057 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/docs/Modules.rst b/docs/Modules.rst
index b8841c0a5cec6660730fb9db1220333affcd3236..2b1bde2fedc109463a5aa67de3912b771475d82b 100644 (file)
--- a/docs/Modules.rst
+++ b/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/lib/Basic/Module.cpp b/lib/Basic/Module.cpp
index ac3d7c55967997e90fd2826321b52bfbc1972956..a6fd931cb174c2871cbcf30fa56e846dc6c29840 100644 (file)
--- a/lib/Basic/Module.cpp
+++ b/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/test/Modules/Inputs/DependsOnModule.framework/Headers/coroutines.h b/test/Modules/Inputs/DependsOnModule.framework/Headers/coroutines.h
deleted file mode 100644 (file)
index 85281f5..0000000
--- a/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/test/Modules/Inputs/DependsOnModule.framework/Headers/not_coroutines.h b/test/Modules/Inputs/DependsOnModule.framework/Headers/not_coroutines.h
deleted file mode 100644 (file)
index 9312b9a..0000000
--- a/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/test/Modules/Inputs/DependsOnModule.framework/module.map b/test/Modules/Inputs/DependsOnModule.framework/module.map
index 4d468f2a8c01c19e3a7aa7eafc5994689027b5c4..b62308583df43e2218325f4b2632bb6e2d339c73 100644 (file)
--- a/test/Modules/Inputs/DependsOnModule.framework/module.map
+++ b/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/test/Modules/requires-coroutines.mm b/test/Modules/requires-coroutines.mm
deleted file mode 100644 (file)
index d3519cd..0000000
--- a/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