summaryrefslogtreecommitdiffstats
path: root/libcxx/include/regex
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2018-07-05 18:41:50 +0000
committerLouis Dionne <ldionne@apple.com>2018-07-05 18:41:50 +0000
commit195a499d638db5157a64c9c816b76154096ecd52 (patch)
treecc8b828d9c2b9f596d7ee41600d0c59efcad2867 /libcxx/include/regex
parentd8f5b2d612d2d612e9d0503752c00b43ed8f4ba7 (diff)
downloadbcm5719-llvm-195a499d638db5157a64c9c816b76154096ecd52.tar.gz
bcm5719-llvm-195a499d638db5157a64c9c816b76154096ecd52.zip
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/regex')
-rw-r--r--libcxx/include/regex2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/regex b/libcxx/include/regex
index 84aacc029ed..612fa84ce30 100644
--- a/libcxx/include/regex
+++ b/libcxx/include/regex
@@ -968,7 +968,7 @@ public:
};
template <regex_constants::error_type _Ev>
-_LIBCPP_NORETURN inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_NORETURN inline _LIBCPP_ALWAYS_INLINE
void __throw_regex_error()
{
#ifndef _LIBCPP_NO_EXCEPTIONS
OpenPOWER on IntegriCloud