2 files changed, 5 insertions, 11 deletions
diff --git a/libcxx/include/experimental/coroutine b/libcxx/include/experimental/coroutine
index 208a4d21761..f53aceaa3f4 100644
--- a/libcxx/include/experimental/coroutine
+++ b/libcxx/include/experimental/coroutine
@@ -194,15 +194,9 @@ public:
         return *this;
     }
 
-  _LIBCPP_INLINE_VISIBILITY
-    _Promise& promise() {
-        return *reinterpret_cast<_Promise*>(
-            __builtin_coro_promise(this->__handle_, alignof(_Promise), false));
-    }
-
     _LIBCPP_INLINE_VISIBILITY
-    _Promise const& promise() const {
-        return *reinterpret_cast<_Promise const*>(
+    _Promise& promise() const {
+        return *reinterpret_cast<_Promise*>(
             __builtin_coro_promise(this->__handle_, alignof(_Promise), false));
     }
 
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.prom/promise.sh.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.prom/promise.sh.cpp
index 290aaa38223..597ffd6d27f 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.prom/promise.sh.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.prom/promise.sh.cpp
@@ -39,12 +39,12 @@ void do_test(coro::coroutine_handle<Promise>&& H) {
   // FIXME Add a runtime test
   {
     ASSERT_SAME_TYPE(decltype(H.promise()), Promise&);
-    ASSERT_NOT_NOEXCEPT(H.promise());
+    LIBCPP_ASSERT_NOT_NOEXCEPT(H.promise());
   }
   {
     auto const& CH = H;
-    ASSERT_SAME_TYPE(decltype(CH.promise()), Promise const&);
-    ASSERT_NOT_NOEXCEPT(CH.promise());
+    ASSERT_SAME_TYPE(decltype(CH.promise()), Promise&);
+    LIBCPP_ASSERT_NOT_NOEXCEPT(CH.promise());
   }
 }