diff options
| author | Eric Fiselier <eric@efcs.ca> | 2018-07-17 05:48:48 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2018-07-17 05:48:48 +0000 |
| commit | 81d0dbda79f8db7f64dc3c34ac544adac45f358c (patch) | |
| tree | 96e2cfbf5c51e269ba0b3fec1b30872a4cbf7a6c | |
| parent | c376a1916b87e2c6330dc43cf9d49acf3ad33a3b (diff) | |
| download | bcm5719-llvm-81d0dbda79f8db7f64dc3c34ac544adac45f358c.tar.gz bcm5719-llvm-81d0dbda79f8db7f64dc3c34ac544adac45f358c.zip | |
Address "always inline function is not always inlinable" warning with GCC.
When an always_inline function is used prior to the functions definition,
the compiler may not be able to inline it as requested by the attribute.
GCC flags the `basic_string(CharT const*)` function as one such example.
This patch supresses the warning, and the problem, by moving the
definition of the string constructor to the inline declaration.
This ensures the body is available when it is first ODR used.
llvm-svn: 337235
| -rw-r--r-- | libcxx/include/string | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/libcxx/include/string b/libcxx/include/string index 96d36f4f7f4..162e54058c4 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -807,8 +807,14 @@ public: #endif // _LIBCPP_CXX03_LANG template <class = typename enable_if<__is_allocator<_Allocator>::value, nullptr_t>::type> - _LIBCPP_INLINE_VISIBILITY - basic_string(const _CharT* __s); + _LIBCPP_INLINE_VISIBILITY + basic_string(const _CharT* __s) { + _LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*) detected nullptr"); + __init(__s, traits_type::length(__s)); +# if _LIBCPP_DEBUG_LEVEL >= 2 + __get_db()->__insert_c(this); +# endif + } template <class = typename enable_if<__is_allocator<_Allocator>::value, nullptr_t>::type> _LIBCPP_INLINE_VISIBILITY @@ -1775,17 +1781,6 @@ basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s, size_ty template <class _CharT, class _Traits, class _Allocator> template <class> -basic_string<_CharT, _Traits, _Allocator>::basic_string(const _CharT* __s) -{ - _LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*) detected nullptr"); - __init(__s, traits_type::length(__s)); -#if _LIBCPP_DEBUG_LEVEL >= 2 - __get_db()->__insert_c(this); -#endif -} - -template <class _CharT, class _Traits, class _Allocator> -template <class> basic_string<_CharT, _Traits, _Allocator>::basic_string(const _CharT* __s, const _Allocator& __a) : __r_(__second_tag(), __a) { |
