diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-02-24 21:33:44 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-02-24 23:42:41 +0000 |
| commit | 41cbcf53dc60b7434b9ee059b3a734a47f5bf212 (patch) | |
| tree | 264dc4687c317ad327f33b0f0b6c556eee8be5a4 /libstdc++-v3 | |
| parent | ae3c4e521dd0b66db712639298cd08331d62f315 (diff) | |
| download | gcc-41cbcf53dc60b7434b9ee059b3a734a47f5bf212.zip gcc-41cbcf53dc60b7434b9ee059b3a734a47f5bf212.tar.gz gcc-41cbcf53dc60b7434b9ee059b3a734a47f5bf212.tar.bz2 | |
libstdc++: Fix cast in source_location::current() [PR104602]
This fixes a problem for Clang, which is going to return a non-void
pointer from __builtin_source_location(). The current definition of
std::source_location::current() converts that to void* and then has to
cast it back again in the body (which makes it invalid in a constant
expression). By using the actual type of the returned pointer, we avoid
the problematic cast for Clang.
libstdc++-v3/ChangeLog:
PR libstdc++/104602
* include/std/source_location (source_location::current): Use
deduced type of __builtin_source_location().
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/include/std/source_location | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/source_location b/libstdc++-v3/include/std/source_location index d6c7be5..7b091bb 100644 --- a/libstdc++-v3/include/std/source_location +++ b/libstdc++-v3/include/std/source_location @@ -43,12 +43,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { private: using uint_least32_t = __UINT_LEAST32_TYPE__; + using __builtin_ret_type = decltype(__builtin_source_location()); public: // [support.srcloc.cons], creation static consteval source_location - current(const void* __p = __builtin_source_location()) noexcept + current(__builtin_ret_type __p = __builtin_source_location()) noexcept { source_location __ret; __ret._M_impl = static_cast <const __impl*>(__p); |