summaryrefslogtreecommitdiffstats
path: root/libcxx/include/exception
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2018-07-11 23:14:33 +0000
committerLouis Dionne <ldionne@apple.com>2018-07-11 23:14:33 +0000
commitdc7200b486b6c5b5229abcee97c160145cc3d955 (patch)
treef4373ca956f1ba3ccf7bde5e1a396f9819472f60 /libcxx/include/exception
parent62c76db4eec8ef64a03c4b077045893bebfc38e9 (diff)
downloadbcm5719-llvm-dc7200b486b6c5b5229abcee97c160145cc3d955.tar.gz
bcm5719-llvm-dc7200b486b6c5b5229abcee97c160145cc3d955.zip
[libc++] Take 2: Replace uses of _LIBCPP_ALWAYS_INLINE by _LIBCPP_INLINE_VISIBILITY
Summary: We never actually mean to always inline a function -- all the uses of the macro I could find are actually attempts to control the visibility of symbols. This is better described by _LIBCPP_INLINE_VISIBILITY, which is actually always defined the same. This change is orthogonal to the decision of what we're actually going to do with _LIBCPP_INLINE_VISIBILITY -- it just simplifies things by having one canonical way of doing things. Note that this commit had originally been applied in r336369 and then reverted in r336382 because of unforeseen problems. Both of these problems have now been fixed. Reviewers: EricWF, mclow.lists Subscribers: christof, dexonsmith, erikvanderpoel Differential Revision: https://reviews.llvm.org/D48892 llvm-svn: 336866
Diffstat (limited to 'libcxx/include/exception')
-rw-r--r--libcxx/include/exception4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/exception b/libcxx/include/exception
index 79bd6ac2ae3..b517486b5a8 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_ALWAYS_INLINE void
+ _LIBCPP_NORETURN static inline _LIBCPP_INLINE_VISIBILITY 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_ALWAYS_INLINE void
+ _LIBCPP_NORETURN static inline _LIBCPP_INLINE_VISIBILITY void
#ifndef _LIBCPP_CXX03_LANG
__do_throw(_Tp&& __t)
#else
OpenPOWER on IntegriCloud