Re-add <experimental/coroutine> to the module map.

The original issues were caused because <experimental/coroutine>
didn't correctly #ifdef out enough of the header, which caused incomplete
types to be used.

This patch fixes the `#if defined(__cpp_coroutines)` guard and re-adds
the headers to the module map.

It also uglifies some incorrectly non-reserved names.

llvm-svn: 303936

2 files changed, 7 insertions, 9 deletions

diff --git a/libcxx/include/experimental/coroutine b/libcxx/include/experimental/coroutine
index f2b3e4edeaa..161f95bde55 100644
--- a/libcxx/include/experimental/coroutine
+++ b/libcxx/include/experimental/coroutine
@@ -85,7 +85,7 @@ struct _LIBCPP_TEMPLATE_VIS coroutine_traits
 {
 };
 
-template <typename Promise = void>
+template <typename _Promise = void>
 class _LIBCPP_TEMPLATE_VIS coroutine_handle;
 
 #if defined(__cpp_coroutines)
@@ -217,8 +217,6 @@ public:
     }
 };
 
-#endif // defined(__cpp_coroutines)
-
 struct _LIBCPP_TYPE_VIS suspend_never {
   _LIBCPP_ALWAYS_INLINE
   bool await_ready() const noexcept { return true; }
@@ -237,6 +235,8 @@ struct _LIBCPP_TYPE_VIS suspend_always {
   void await_resume() const noexcept {}
 };
 
+#endif // defined(__cpp_coroutines)
+
 _LIBCPP_END_NAMESPACE_EXPERIMENTAL_COROUTINES
 
 _LIBCPP_BEGIN_NAMESPACE_STD
diff --git a/libcxx/include/module.modulemap b/libcxx/include/module.modulemap
index ad765c07d48..462d4234ae6 100644
--- a/libcxx/include/module.modulemap
+++ b/libcxx/include/module.modulemap
@@ -501,12 +501,10 @@ module std [system] {
       header "experimental/chrono"
       export *
     }
-    // FIXME: This module only works when -fcoroutines-ts is enabled and it
-    // breaks the modules build otherwise.
-    // module coroutine {
-    //  header "experimental/coroutine"
-    //  export *
-    // }
+     module coroutine {
+      header "experimental/coroutine"
+      export *
+    }
     module deque {
       header "experimental/deque"
       export *