diff options
author | Nikolas Klauser <nikolasklauser@berlin.de> | 2023-02-02 11:47:01 +0100 |
---|---|---|
committer | Nikolas Klauser <nikolasklauser@berlin.de> | 2023-02-17 17:39:03 +0100 |
commit | b22aa3d74f276afbfbd10953de68e3b4f8cef907 (patch) | |
tree | f7e3559590d5b3c533cff9ee37d8369e33291b66 /libcxx/src | |
parent | 132003603ae3453bc385ffd5ed53f5e8057ae1bc (diff) | |
download | llvm-b22aa3d74f276afbfbd10953de68e3b4f8cef907.tar.gz |
[libc++][NFC] Rename _LIBCPP_NO_EXCEPTIONS to _LIBCPP_HAS_NO_EXCEPTIONS
Other macros that disable parts of the library are named `_LIBCPP_HAS_NO_WHATEVER`.
Reviewed By: ldionne, Mordante, #libc
Spies: libcxx-commits, smeenai
Differential Revision: https://reviews.llvm.org/D143163
Diffstat (limited to 'libcxx/src')
-rw-r--r-- | libcxx/src/filesystem/filesystem_common.h | 24 | ||||
-rw-r--r-- | libcxx/src/future.cpp | 4 | ||||
-rw-r--r-- | libcxx/src/ios.cpp | 8 | ||||
-rw-r--r-- | libcxx/src/locale.cpp | 28 | ||||
-rw-r--r-- | libcxx/src/mutex.cpp | 16 | ||||
-rw-r--r-- | libcxx/src/new.cpp | 38 | ||||
-rw-r--r-- | libcxx/src/string.cpp | 2 | ||||
-rw-r--r-- | libcxx/src/support/runtime/exception_fallback.ipp | 8 | ||||
-rw-r--r-- | libcxx/src/support/runtime/exception_msvc.ipp | 8 | ||||
-rw-r--r-- | libcxx/src/system_error.cpp | 2 |
10 files changed, 69 insertions, 69 deletions
diff --git a/libcxx/src/filesystem/filesystem_common.h b/libcxx/src/filesystem/filesystem_common.h index 0e71569d8712..fb6f88783cd0 100644 --- a/libcxx/src/filesystem/filesystem_common.h +++ b/libcxx/src/filesystem/filesystem_common.h @@ -96,16 +96,16 @@ format_string(const char* msg, ...) { string ret; va_list ap; va_start(ap, msg); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS ret = format_string_impl(msg, ap); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { va_end(ap); throw; } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS va_end(ap); return ret; } @@ -202,16 +202,16 @@ struct ErrorHandler { T report(const error_code& ec, const char* msg, ...) const { va_list ap; va_start(ap, msg); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS report_impl(ec, msg, ap); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { va_end(ap); throw; } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS va_end(ap); return error_value<T>(); } @@ -224,16 +224,16 @@ struct ErrorHandler { T report(errc const& err, const char* msg, ...) const { va_list ap; va_start(ap, msg); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS report_impl(make_error_code(err), msg, ap); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { va_end(ap); throw; } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS va_end(ap); return error_value<T>(); } diff --git a/libcxx/src/future.cpp b/libcxx/src/future.cpp index cdaa93827533..f8f466bd5a21 100644 --- a/libcxx/src/future.cpp +++ b/libcxx/src/future.cpp @@ -197,12 +197,12 @@ promise<void>::~promise() { if (__state_) { -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS if (!__state_->__has_value() && __state_->use_count() > 1) __state_->set_exception(make_exception_ptr( future_error(make_error_code(future_errc::broken_promise)) )); -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS __state_->__release_shared(); } } diff --git a/libcxx/src/ios.cpp b/libcxx/src/ios.cpp index 870406b554d9..bb62eb994875 100644 --- a/libcxx/src/ios.cpp +++ b/libcxx/src/ios.cpp @@ -413,20 +413,20 @@ void ios_base::__set_badbit_and_consider_rethrow() { __rdstate_ |= badbit; -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS if (__exceptions_ & badbit) throw; -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS } void ios_base::__set_failbit_and_consider_rethrow() { __rdstate_ |= failbit; -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS if (__exceptions_ & failbit) throw; -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS } bool diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp index 678c4877ef8b..1e60c025b127 100644 --- a/libcxx/src/locale.cpp +++ b/libcxx/src/locale.cpp @@ -118,7 +118,7 @@ countof(const T * const begin, const T * const end) _LIBCPP_NORETURN static void __throw_runtime_error(const string &msg) { -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS throw runtime_error(msg); #else (void)msg; @@ -236,10 +236,10 @@ locale::__imp::__imp(const string& name, size_t refs) facets_(N), name_(name) { -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS facets_ = locale::classic().__locale_->facets_; for (unsigned i = 0; i < facets_.size(); ++i) if (facets_[i]) @@ -286,7 +286,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS install(new messages_byname<wchar_t>(name_)); #endif -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { @@ -295,7 +295,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP facets_[i]->__release_shared(); throw; } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS } locale::__imp::__imp(const __imp& other) @@ -316,10 +316,10 @@ locale::__imp::__imp(const __imp& other, const string& name, locale::category c) for (unsigned i = 0; i < facets_.size(); ++i) if (facets_[i]) facets_[i]->__add_shared(); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS if (c & locale::collate) { install(new collate_byname<char>(name)); @@ -380,7 +380,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP install(new messages_byname<wchar_t>(name)); #endif } -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { @@ -389,7 +389,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP facets_[i]->__release_shared(); throw; } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS } template<class F> @@ -409,10 +409,10 @@ locale::__imp::__imp(const __imp& other, const __imp& one, locale::category c) for (unsigned i = 0; i < facets_.size(); ++i) if (facets_[i]) facets_[i]->__add_shared(); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS if (c & locale::collate) { install_from<_VSTD::collate<char> >(one); @@ -489,7 +489,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP install_from<_VSTD::messages<wchar_t> >(one); #endif } -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { @@ -498,7 +498,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP facets_[i]->__release_shared(); throw; } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS } locale::__imp::__imp(const __imp& other, facet* f, long id) @@ -6529,7 +6529,7 @@ void __do_nothing(void*) {} void __throw_runtime_error(const char* msg) { -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS throw runtime_error(msg); #else (void)msg; diff --git a/libcxx/src/mutex.cpp b/libcxx/src/mutex.cpp index 01b7420fa3b8..c09c064fdbac 100644 --- a/libcxx/src/mutex.cpp +++ b/libcxx/src/mutex.cpp @@ -211,21 +211,21 @@ void __call_once(volatile once_flag::_State_type& flag, void* arg, #if defined(_LIBCPP_HAS_NO_THREADS) if (flag == 0) { -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS flag = 1; func(arg); flag = ~once_flag::_State_type(0); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { flag = 0; throw; } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS } #else // !_LIBCPP_HAS_NO_THREADS __libcpp_mutex_lock(&mut); @@ -233,10 +233,10 @@ void __call_once(volatile once_flag::_State_type& flag, void* arg, __libcpp_condvar_wait(&cv, &mut); if (flag == 0) { -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS __libcpp_relaxed_store(&flag, once_flag::_State_type(1)); __libcpp_mutex_unlock(&mut); func(arg); @@ -245,7 +245,7 @@ void __call_once(volatile once_flag::_State_type& flag, void* arg, _AO_Release); __libcpp_mutex_unlock(&mut); __libcpp_condvar_broadcast(&cv); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { @@ -255,7 +255,7 @@ void __call_once(volatile once_flag::_State_type& flag, void* arg, __libcpp_condvar_broadcast(&cv); throw; } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS } else __libcpp_mutex_unlock(&mut); diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp index f2ca698512ff..3c3d1dc7f56b 100644 --- a/libcxx/src/new.cpp +++ b/libcxx/src/new.cpp @@ -39,7 +39,7 @@ const nothrow_t nothrow{}; void __throw_bad_alloc() { -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS throw bad_alloc(); #else _VSTD::abort(); @@ -73,7 +73,7 @@ operator new(std::size_t size) _THROW_BAD_ALLOC if (nh) nh(); else -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS throw std::bad_alloc(); #else break; @@ -87,17 +87,17 @@ void* operator new(size_t size, const std::nothrow_t&) noexcept { void* p = nullptr; -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS p = ::operator new(size); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS return p; } @@ -113,17 +113,17 @@ void* operator new[](size_t size, const std::nothrow_t&) noexcept { void* p = nullptr; -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS p = ::operator new[](size); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS return p; } @@ -193,7 +193,7 @@ operator new(std::size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC if (nh) nh(); else { -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS throw std::bad_alloc(); #else break; @@ -208,17 +208,17 @@ void* operator new(size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept { void* p = nullptr; -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS p = ::operator new(size, alignment); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS return p; } @@ -234,17 +234,17 @@ void* operator new[](size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept { void* p = nullptr; -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS p = ::operator new[](size, alignment); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS return p; } diff --git a/libcxx/src/string.cpp b/libcxx/src/string.cpp index db211b224277..b18dcceb37c0 100644 --- a/libcxx/src/string.cpp +++ b/libcxx/src/string.cpp @@ -63,7 +63,7 @@ namespace template<typename T> inline void throw_helper(const string& msg) { -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS throw T(msg); #else fprintf(stderr, "%s\n", msg.c_str()); diff --git a/libcxx/src/support/runtime/exception_fallback.ipp b/libcxx/src/support/runtime/exception_fallback.ipp index ade933567f23..3b2716d36f0e 100644 --- a/libcxx/src/support/runtime/exception_fallback.ipp +++ b/libcxx/src/support/runtime/exception_fallback.ipp @@ -51,15 +51,15 @@ _LIBCPP_NORETURN void terminate() noexcept { -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS (*get_terminate())(); // handler should not return fprintf(stderr, "terminate_handler unexpectedly returned\n"); ::abort(); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { @@ -67,7 +67,7 @@ terminate() noexcept fprintf(stderr, "terminate_handler unexpectedly threw an exception\n"); ::abort(); } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS } bool uncaught_exception() noexcept { return uncaught_exceptions() > 0; } diff --git a/libcxx/src/support/runtime/exception_msvc.ipp b/libcxx/src/support/runtime/exception_msvc.ipp index 7e36c7068a28..0114d5adee16 100644 --- a/libcxx/src/support/runtime/exception_msvc.ipp +++ b/libcxx/src/support/runtime/exception_msvc.ipp @@ -57,15 +57,15 @@ terminate_handler get_terminate() noexcept { _LIBCPP_NORETURN void terminate() noexcept { -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS (*get_terminate())(); // handler should not return fprintf(stderr, "terminate_handler unexpectedly returned\n"); ::abort(); -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { @@ -73,7 +73,7 @@ void terminate() noexcept fprintf(stderr, "terminate_handler unexpectedly threw an exception\n"); ::abort(); } -#endif // _LIBCPP_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS } bool uncaught_exception() noexcept { return uncaught_exceptions() > 0; } diff --git a/libcxx/src/system_error.cpp b/libcxx/src/system_error.cpp index ba5fa8f30b28..190abfd703ab 100644 --- a/libcxx/src/system_error.cpp +++ b/libcxx/src/system_error.cpp @@ -286,7 +286,7 @@ system_error::~system_error() noexcept void __throw_system_error(int ev, const char* what_arg) { -#ifndef _LIBCPP_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS throw system_error(error_code(ev, system_category()), what_arg); #else (void)ev; |