diff mbox series

[committed] libstdc++: Guard uses of is_pointer_interconvertible_v [PR114891]

Message ID 20240501162834.3282221-1-jwakely@redhat.com
State New
Headers show
Series [committed] libstdc++: Guard uses of is_pointer_interconvertible_v [PR114891] | expand

Commit Message

Jonathan Wakely May 1, 2024, 4:27 p.m. UTC 
Tested x86_64-linux. Pushed to trunk.

I'll backport this to gcc-14 as well, but it can wait until after the
14.1 release.

-- >8 --

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 | 8 ++++++++
 1 file changed, 8 insertions(+)
diff mbox series

Patch

diff --git a/libstdc++-v3/include/std/generator b/libstdc++-v3/include/std/generator
index 789016b5a88..1d5acc91420 100644
--- a/libstdc++-v3/include/std/generator
+++ b/libstdc++-v3/include/std/generator
@@ -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;