Author: ericwf
Date: Fri May 26 22:04:51 2017
New Revision: 304057
URL: http://llvm.org/viewvc/llvm-project?rev=304057&view=rev
Log:
Revert "[coroutines] Support "coroutines" feature in module map requires clause"
This reverts commit r304054.
Removed:
cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/Headers/coroutines.h
cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/Headers/not_coroutines.h
cfe/trunk/test/Modules/requires-coroutines.mm
Modified:
cfe/trunk/docs/Modules.rst
cfe/trunk/lib/Basic/Module.cpp
cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/module.map
Modified: cfe/trunk/docs/Modules.rst
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/Modules.rst?rev=304057&r1=304056&r2=304057&view=diff
==============================================================================
--- cfe/trunk/docs/Modules.rst (original)
+++ cfe/trunk/docs/Modules.rst Fri May 26 22:04:51 2017
@@ -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.
Modified: cfe/trunk/lib/Basic/Module.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Module.cpp?rev=304057&r1=304056&r2=304057&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Module.cpp (original)
+++ cfe/trunk/lib/Basic/Module.cpp Fri May 26 22:04:51 2017
@@ -64,7 +64,6 @@ static bool hasFeature(StringRef Feature
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)
Removed:
cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/Headers/coroutines.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/Headers/coroutines.h?rev=304056&view=auto
==============================================================================
---
cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/Headers/coroutines.h
(original)
+++
cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/Headers/coroutines.h
(removed)
@@ -1,3 +0,0 @@
-#ifndef __cpp_coroutines
-#error coroutines must be enabled
-#endif
Removed:
cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/Headers/not_coroutines.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/Headers/not_coroutines.h?rev=304056&view=auto
==============================================================================
---
cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/Headers/not_coroutines.h
(original)
+++
cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/Headers/not_coroutines.h
(removed)
@@ -1,3 +0,0 @@
-#ifdef __cpp_coroutines
-#error coroutines must NOT be enabled
-#endif
Modified: cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/module.map
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/module.map?rev=304057&r1=304056&r2=304057&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/module.map
(original)
+++ cfe/trunk/test/Modules/Inputs/DependsOnModule.framework/module.map Fri May
26 22:04:51 2017
@@ -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"
Removed: cfe/trunk/test/Modules/requires-coroutines.mm
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/requires-coroutines.mm?rev=304056&view=auto
==============================================================================
--- cfe/trunk/test/Modules/requires-coroutines.mm (original)
+++ cfe/trunk/test/Modules/requires-coroutines.mm (removed)
@@ -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
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
