Skip to content

Commit

Permalink
[libc++] Work around dynamic linking of stringstream::str() on Windows
Browse files Browse the repository at this point in the history
Also `istringstream::str()` and `ostringstrem::str()`.

llvm/llvm-project#40363 causes `str()`
to be dllimport'ed despite _LIBCPP_HIDE_FROM_ABI.
This is a temporary solution until #40363 is fixed.

Reviewed By: #libc, thakis, philnik

Differential Revision: https://reviews.llvm.org/D157602

(cherry picked from commit 090996f)
  • Loading branch information
pfusik authored and llvmbot committed Aug 16, 2023
1 parent f934d6b commit 216e925
Showing 1 changed file with 25 additions and 19 deletions.
44 changes: 25 additions & 19 deletions libcxx/include/sstream
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ public:
}

_LIBCPP_HIDE_FROM_ABI basic_string_view<char_type, traits_type> view() const noexcept;
#endif
#endif // _LIBCPP_STD_VER >= 20

void str(const string_type& __s) {
__str_ = __s;
Expand Down Expand Up @@ -904,20 +904,22 @@ public:
return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);
}

#if _LIBCPP_STD_VER >= 20
_LIBCPP_HIDE_FROM_ABI string_type str() const & { return __sb_.str(); }
#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_BUILDING_LIBRARY)
_LIBCPP_HIDE_FROM_ABI string_type str() const { return __sb_.str(); }
#else
_LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str() const & { return __sb_.str(); }

_LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str() && { return std::move(__sb_).str(); }
#endif

#if _LIBCPP_STD_VER >= 20
template <class _SAlloc>
requires __is_allocator<_SAlloc>::value
_LIBCPP_HIDE_FROM_ABI basic_string<char_type, traits_type, _SAlloc> str(const _SAlloc& __sa) const {
return __sb_.str(__sa);
}

_LIBCPP_HIDE_FROM_ABI string_type str() && { return std::move(__sb_).str(); }

_LIBCPP_HIDE_FROM_ABI basic_string_view<char_type, traits_type> view() const noexcept { return __sb_.view(); }
#else // _LIBCPP_STD_VER >= 20
_LIBCPP_HIDE_FROM_ABI string_type str() const { return __sb_.str(); }
#endif // _LIBCPP_STD_VER >= 20

_LIBCPP_HIDE_FROM_ABI void str(const string_type& __s) { __sb_.str(__s); }
Expand Down Expand Up @@ -1027,20 +1029,22 @@ public:
return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);
}

#if _LIBCPP_STD_VER >= 20
_LIBCPP_HIDE_FROM_ABI string_type str() const & { return __sb_.str(); }
#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_BUILDING_LIBRARY)
_LIBCPP_HIDE_FROM_ABI string_type str() const { return __sb_.str(); }
#else
_LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str() const & { return __sb_.str(); }

_LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str() && { return std::move(__sb_).str(); }
#endif

#if _LIBCPP_STD_VER >= 20
template <class _SAlloc>
requires __is_allocator<_SAlloc>::value
_LIBCPP_HIDE_FROM_ABI basic_string<char_type, traits_type, _SAlloc> str(const _SAlloc& __sa) const {
return __sb_.str(__sa);
}

_LIBCPP_HIDE_FROM_ABI string_type str() && { return std::move(__sb_).str(); }

_LIBCPP_HIDE_FROM_ABI basic_string_view<char_type, traits_type> view() const noexcept { return __sb_.view(); }
#else // _LIBCPP_STD_VER >= 20
_LIBCPP_HIDE_FROM_ABI string_type str() const { return __sb_.str(); }
#endif // _LIBCPP_STD_VER >= 20

_LIBCPP_HIDE_FROM_ABI void str(const string_type& __s) { __sb_.str(__s); }
Expand Down Expand Up @@ -1149,20 +1153,22 @@ public:
return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);
}

#if _LIBCPP_STD_VER >= 20
_LIBCPP_HIDE_FROM_ABI string_type str() const & { return __sb_.str(); }
#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_BUILDING_LIBRARY)
_LIBCPP_HIDE_FROM_ABI string_type str() const { return __sb_.str(); }
#else
_LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str() const & { return __sb_.str(); }

_LIBCPP_HIDE_FROM_ABI_SSTREAM string_type str() && { return std::move(__sb_).str(); }
#endif

#if _LIBCPP_STD_VER >= 20
template <class _SAlloc>
requires __is_allocator<_SAlloc>::value
_LIBCPP_HIDE_FROM_ABI basic_string<char_type, traits_type, _SAlloc> str(const _SAlloc& __sa) const {
return __sb_.str(__sa);
}

_LIBCPP_HIDE_FROM_ABI string_type str() && { return std::move(__sb_).str(); }

_LIBCPP_HIDE_FROM_ABI basic_string_view<char_type, traits_type> view() const noexcept { return __sb_.view(); }
#else // _LIBCPP_STD_VER >= 20
_LIBCPP_HIDE_FROM_ABI string_type str() const { return __sb_.str(); }
#endif // _LIBCPP_STD_VER >= 20

_LIBCPP_HIDE_FROM_ABI void str(const string_type& __s) { __sb_.str(__s); }
Expand Down

0 comments on commit 216e925

Please sign in to comment.