From 2e612e1621ff0682dd170a948a3ea59f5497f4ea Mon Sep 17 00:00:00 2001
From: Casey Carter <Casey@Carter.net>
Date: Thu, 1 Jun 2017 22:40:16 +0000
Subject: [PATCH] [test] Allow non-libc++ coroutine_handle::done to strengthen
 noexcept

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@304487 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../coroutine.handle.completion/done.pass.cpp                 | 2 +-
 .../support.coroutines/end.to.end/await_result.pass.cpp       | 4 ++--
 .../support.coroutines/end.to.end/bool_await_suspend.pass.cpp | 2 +-
 .../support.coroutines/end.to.end/oneshot_func.pass.cpp       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.completion/done.pass.cpp b/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.completion/done.pass.cpp
index 74a9e7bda..240d93245 100644
--- a/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.completion/done.pass.cpp
+++ b/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.completion/done.pass.cpp
@@ -33,7 +33,7 @@ void do_test(coro::coroutine_handle<Promise> const& H) {
   // FIXME Add a runtime test
   {
     ASSERT_SAME_TYPE(decltype(H.done()), bool);
-    ASSERT_NOT_NOEXCEPT(H.done());
+    LIBCPP_ASSERT_NOT_NOEXCEPT(H.done());
   }
 }
 
diff --git a/test/std/experimental/language.support/support.coroutines/end.to.end/await_result.pass.cpp b/test/std/experimental/language.support/support.coroutines/end.to.end/await_result.pass.cpp
index 769a825df..b8606317a 100644
--- a/test/std/experimental/language.support/support.coroutines/end.to.end/await_result.pass.cpp
+++ b/test/std/experimental/language.support/support.coroutines/end.to.end/await_result.pass.cpp
@@ -23,7 +23,7 @@ struct coro_t {
     }
     suspend_never initial_suspend() { return {}; }
     suspend_never final_suspend() { return {}; }
-    void return_void(){}
+    void return_void() {}
     static void unhandled_exception() {}
   };
 };
@@ -37,7 +37,7 @@ struct B {
 
 
 struct A {
-  ~A(){}
+  ~A() {}
   bool await_ready() { return true; }
   int await_resume() { return 42; }
   template <typename F> void await_suspend(F) {}
diff --git a/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp b/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp
index 60b085489..12ab92ff3 100644
--- a/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp
+++ b/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp
@@ -25,7 +25,7 @@ struct coro_t {
     }
     suspend_never initial_suspend() { return {}; }
     suspend_never final_suspend() { return {}; }
-    void return_void(){}
+    void return_void() {}
     void unhandled_exception() {}
   };
   coro_t(coroutine_handle<promise_type> hh) : h(hh) {}
diff --git a/test/std/experimental/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp b/test/std/experimental/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp
index d5f2c40e2..ae0a950dc 100644
--- a/test/std/experimental/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp
+++ b/test/std/experimental/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp
@@ -68,10 +68,10 @@ private:
 
 std::vector<int> yielded_values = {};
 int yield(int x) { yielded_values.push_back(x); return x + 1; }
-float fyield(int x) { yielded_values.push_back(x); return x + 2; }
+float fyield(int x) { yielded_values.push_back(x); return static_cast<float>(x + 2); }
 
 void Do1(func<int> f) { yield(f()); }
-void Do2(func<double> f) { yield(f()); }
+void Do2(func<double> f) { yield(static_cast<int>(f())); }
 
 int main() {
   Do1([] { return yield(43); });