]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Guard uses of is_pointer_interconvertible_v [PR114891]
authorJonathan Wakely <jwakely@redhat.com>
Tue, 30 Apr 2024 08:48:00 +0000 (09:48 +0100)
committerJonathan Wakely <jwakely@redhat.com>
Wed, 1 May 2024 16:24:01 +0000 (17:24 +0100)
This type trait isn't supported by Clang 18. It's only used in static
assertions, so they can just be omitted if the trait isn't available.

libstdc++-v3/ChangeLog:

PR libstdc++/114891
* include/std/generator: Check feature test macro before using
is_pointer_interconvertible_v.

libstdc++-v3/include/std/generator

index 789016b5a883cc8b27c8363280634b26a87c5ae2..1d5acc9142038438181b462df4f359b706614e0e 100644 (file)
@@ -322,8 +322,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        template<typename _Promise>
        auto await_suspend(std::coroutine_handle<_Promise> __c) noexcept
        {
+#ifdef __glibcxx_is_pointer_interconvertible
          static_assert(is_pointer_interconvertible_base_of_v<
                        _Promise_erased, _Promise>);
+#endif
 
          auto& __n = __c.promise()._M_nest;
          return __n._M_pop();
@@ -344,8 +346,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        template<typename _Promise>
        void await_suspend(std::coroutine_handle<_Promise>) noexcept
        {
+#ifdef __glibcxx_is_pointer_interconvertible
          static_assert(is_pointer_interconvertible_base_of_v<
                        _Promise_erased, _Promise>);
+#endif
          _M_bottom_value = ::std::addressof(_M_value);
        }
 
@@ -375,8 +379,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        std::coroutine_handle<>
        await_suspend(std::coroutine_handle<_Promise> __p) noexcept
        {
+#ifdef __glibcxx_is_pointer_interconvertible
          static_assert(is_pointer_interconvertible_base_of_v<
                        _Promise_erased, _Promise>);
+#endif
 
          auto __c = _Coro_handle::from_address(__p.address());
          auto __t = _Coro_handle::from_address(this->_M_gen._M_coro.address());
@@ -685,8 +691,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        { return { coroutine_handle<promise_type>::from_promise(*this) }; }
       };
 
+#ifdef __glibcxx_is_pointer_interconvertible
       static_assert(is_pointer_interconvertible_base_of_v<_Erased_promise,
                    promise_type>);
+#endif
 
       generator(const generator&) = delete;