diff options
| author | Louis Dionne <ldionne@apple.com> | 2018-07-05 18:41:50 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2018-07-05 18:41:50 +0000 |
| commit | 195a499d638db5157a64c9c816b76154096ecd52 (patch) | |
| tree | cc8b828d9c2b9f596d7ee41600d0c59efcad2867 /libcxx/include/exception | |
| parent | d8f5b2d612d2d612e9d0503752c00b43ed8f4ba7 (diff) | |
| download | llvm-195a499d638db5157a64c9c816b76154096ecd52.zip llvm-195a499d638db5157a64c9c816b76154096ecd52.tar.gz llvm-195a499d638db5157a64c9c816b76154096ecd52.tar.bz2 | |
Revert "[libc++] Replace uses of _LIBCPP_ALWAYS_INLINE by _LIBCPP_INLINE_VISIBILITY"
This reverts commit r336369. The commit had two problems:
1. __pbump was marked as _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY instead of
_LIBCPP_INLINE_VISIBILITY, which lead to two symbols being added in the
dylib and the check-cxx-abilist failing.
2. The LLDB tests started failing because they undefine
`_LIBCPP_INLINE_VISIBILITY`. I need to figure out why they do that and
fix the tests before we can go forward with this change.
llvm-svn: 336382
Diffstat (limited to 'libcxx/include/exception')
| -rw-r--r-- | libcxx/include/exception | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/exception b/libcxx/include/exception index b517486..79bd6ac 100644 --- a/libcxx/include/exception +++ b/libcxx/include/exception @@ -259,7 +259,7 @@ struct __throw_with_nested; template <class _Tp, class _Up> struct __throw_with_nested<_Tp, _Up, true> { - _LIBCPP_NORETURN static inline _LIBCPP_INLINE_VISIBILITY void + _LIBCPP_NORETURN static inline _LIBCPP_ALWAYS_INLINE void #ifndef _LIBCPP_CXX03_LANG __do_throw(_Tp&& __t) #else @@ -272,7 +272,7 @@ struct __throw_with_nested<_Tp, _Up, true> { template <class _Tp, class _Up> struct __throw_with_nested<_Tp, _Up, false> { - _LIBCPP_NORETURN static inline _LIBCPP_INLINE_VISIBILITY void + _LIBCPP_NORETURN static inline _LIBCPP_ALWAYS_INLINE void #ifndef _LIBCPP_CXX03_LANG __do_throw(_Tp&& __t) #else |