diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2024-05-09 01:52:26 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2024-05-09 01:52:26 -0700 |
| commit | bcb534c295d5cc6fd63caa570cc08e6b148a507c (patch) | |
| tree | 0b17cb1e632d894f50f25e550d5113f232b0e877 /lib/libcxx/src/support/runtime/exception_pointer_msvc.ipp | |
| parent | d9b00ee4ba48717ff6b306a6f9419e7b604ac04b (diff) | |
| parent | 74f52954b9cb40d59d80b839b45bb859146731a7 (diff) | |
| download | zig-bcb534c295d5cc6fd63caa570cc08e6b148a507c.tar.gz zig-bcb534c295d5cc6fd63caa570cc08e6b148a507c.zip | |
Merge branch 'llvm18'
Upgrades the LLVM, Clang, and LLD dependencies to LLVM 18.x
Related to #16270
Diffstat (limited to 'lib/libcxx/src/support/runtime/exception_pointer_msvc.ipp')
| -rw-r--r-- | lib/libcxx/src/support/runtime/exception_pointer_msvc.ipp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/lib/libcxx/src/support/runtime/exception_pointer_msvc.ipp b/lib/libcxx/src/support/runtime/exception_pointer_msvc.ipp index 9e7f392e76..b87742b32d 100644 --- a/lib/libcxx/src/support/runtime/exception_pointer_msvc.ipp +++ b/lib/libcxx/src/support/runtime/exception_pointer_msvc.ipp @@ -19,17 +19,14 @@ _LIBCPP_CRT_FUNC bool __cdecl __ExceptionPtrToBool(const void*); _LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrSwap(void*, void*); _LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrCurrentException(void*); [[noreturn]] _LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrRethrow(const void*); -_LIBCPP_CRT_FUNC void __cdecl -__ExceptionPtrCopyException(void*, const void*, const void*); +_LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrCopyException(void*, const void*, const void*); namespace std { exception_ptr::exception_ptr() noexcept { __ExceptionPtrCreate(this); } exception_ptr::exception_ptr(nullptr_t) noexcept { __ExceptionPtrCreate(this); } -exception_ptr::exception_ptr(const exception_ptr& __other) noexcept { - __ExceptionPtrCopy(this, &__other); -} +exception_ptr::exception_ptr(const exception_ptr& __other) noexcept { __ExceptionPtrCopy(this, &__other); } exception_ptr& exception_ptr::operator=(const exception_ptr& __other) noexcept { __ExceptionPtrAssign(this, &__other); return *this; @@ -43,18 +40,13 @@ exception_ptr& exception_ptr::operator=(nullptr_t) noexcept { exception_ptr::~exception_ptr() noexcept { __ExceptionPtrDestroy(this); } -exception_ptr::operator bool() const noexcept { - return __ExceptionPtrToBool(this); -} +exception_ptr::operator bool() const noexcept { return __ExceptionPtrToBool(this); } bool operator==(const exception_ptr& __x, const exception_ptr& __y) noexcept { return __ExceptionPtrCompare(&__x, &__y); } - -void swap(exception_ptr& lhs, exception_ptr& rhs) noexcept { - __ExceptionPtrSwap(&rhs, &lhs); -} +void swap(exception_ptr& lhs, exception_ptr& rhs) noexcept { __ExceptionPtrSwap(&rhs, &lhs); } exception_ptr __copy_exception_ptr(void* __except, const void* __ptr) { exception_ptr __ret = nullptr; @@ -69,15 +61,13 @@ exception_ptr current_exception() noexcept { return __ret; } -_LIBCPP_NORETURN -void rethrow_exception(exception_ptr p) { __ExceptionPtrRethrow(&p); } +_LIBCPP_NORETURN void rethrow_exception(exception_ptr p) { __ExceptionPtrRethrow(&p); } nested_exception::nested_exception() noexcept : __ptr_(current_exception()) {} nested_exception::~nested_exception() noexcept {} -_LIBCPP_NORETURN -void nested_exception::rethrow_nested() const { +_LIBCPP_NORETURN void nested_exception::rethrow_nested() const { if (__ptr_ == nullptr) terminate(); rethrow_exception(__ptr_); |
