conformance

Author: kennykerr

strings/base_coroutine_foundation.h

@@ -307,22 +307,22 @@ namespace winrt::impl
     template <typename T>
     struct free_await_adapter
     {
-        T&& awaitable;
+        free_await_adapter_impl<T>&& awaitable;
 
         bool await_ready()
         {
-            return free_await_adapter_impl<T>{ static_cast<T&&>(awaitable) }.ready();
+            return awaitable.ready();
         }
 
         template <typename U>
         auto await_suspend(std::experimental::coroutine_handle<U> handle)
         {
-            return free_await_adapter_impl<T>{ static_cast<T&&>(awaitable) }.suspend(handle);
+            return awaitable.suspend(handle);
         }
 
         auto await_resume()
         {
-            return free_await_adapter_impl<T>{ static_cast<T&&>(awaitable) }.resume();
+            return awaitable.resume();
         }
     };
 
@@ -369,17 +369,13 @@ namespace winrt::impl
     template <typename T, std::enable_if_t<has_awaitable_free<T>::value, int> = 0>
     auto get_awaiter(T&& value) noexcept
     {
-        return free_await_adapter<T>{ static_cast<T&&>(value) };
+        return free_await_adapter<T>{ { static_cast<T&&>(value) }};
     }
 
     template <typename T>
     struct notify_awaiter
     {
-        decltype(get_awaiter(std::declval<T&&>())) awaitable;
-
-        notify_awaiter(T&& awaitable) : awaitable(get_awaiter(static_cast<T&&>(awaitable)))
-        {
-        }
+        decltype(get_awaiter(std::declval<T&&>()))&& awaitable;
 
         bool await_ready()
         {
@@ -622,7 +618,7 @@ namespace winrt::impl
                 throw winrt::hresult_canceled();
             }
 
-            return notify_awaiter<Expression>{ static_cast<Expression&&>(expression) };
+            return notify_awaiter<Expression>{ get_awaiter<Expression>(static_cast<Expression&&>(expression)) };
         }
 
         cancellation_token<Derived> await_transform(get_cancellation_token_t) noexcept

test/test/generic_types.cpp

@@ -8,5 +8,9 @@ TEST_CASE("generic_types")
     REQUIRE_EQUAL_NAME(L"Windows.Foundation.Uri", Uri);
     REQUIRE_EQUAL_NAME(L"Windows.Foundation.PropertyType", PropertyType);
     REQUIRE_EQUAL_NAME(L"Windows.Foundation.Point", Point);
+
+    // Clang 9 doesn't think this is a constant expression.
+#ifndef __clang__
     REQUIRE_EQUAL_NAME(L"{96369f54-8eb6-48f0-abce-c1b211e627c3}", IStringable);
+#endif
 }