[libcxx-commits] [libcxx] 16ffd27 - [libcxx][NFC] Address -Wmicrosoft-cast in MSVC's exception_ptr (#210570)
via libcxx-commits
libcxx-commits at lists.llvm.org
Sun Jul 19 17:47:06 PDT 2026
Author: Petr Hosek
Date: 2026-07-19T17:47:01-07:00
New Revision: 16ffd27e3737c01cbabad6eed77b919dc977ad6c
URL: https://github.com/llvm/llvm-project/commit/16ffd27e3737c01cbabad6eed77b919dc977ad6c
DIFF: https://github.com/llvm/llvm-project/commit/16ffd27e3737c01cbabad6eed77b919dc977ad6c.diff
LOG: [libcxx][NFC] Address -Wmicrosoft-cast in MSVC's exception_ptr (#210570)
This was introduced as part of #94977. Rather than suppressing the
warning with `#pragma clang diagnostic ignored`, we use
`reinterpret_cast` to avoid the implicit conversion.
Added:
Modified:
libcxx/src/support/runtime/exception_pointer_msvc.ipp
Removed:
################################################################################
diff --git a/libcxx/src/support/runtime/exception_pointer_msvc.ipp b/libcxx/src/support/runtime/exception_pointer_msvc.ipp
index 3102d1ee93db2..4b877deeec7bc 100644
--- a/libcxx/src/support/runtime/exception_pointer_msvc.ipp
+++ b/libcxx/src/support/runtime/exception_pointer_msvc.ipp
@@ -141,7 +141,7 @@ void __copy_exception_object(void* __dest, const void* __src, const CatchableTyp
#if _EH_RELATIVE_TYPEINFO
const auto __copy_func = reinterpret_cast<void*>(__throw_image_base + __type->copyFunction);
#else // _EH_RELATIVE_TYPEINFO
- const auto __copy_func = __type->copyFunction;
+ const auto __copy_func = reinterpret_cast<void*>(__type->copyFunction);
#endif // _EH_RELATIVE_TYPEINFO
const auto __adjusted = __AdjustPointer(const_cast<void*>(__src), __type->thisDisplacement);
@@ -204,7 +204,8 @@ struct alignas(__STDCPP_DEFAULT_NEW_ALIGNMENT__) __exception_ptr_normal final :
__call_member_function_0(__cpp_eh_record.params.pExceptionObject,
reinterpret_cast<void*>(__throw_info->pmfnUnwind + __throw_image_base));
#else // _EH_RELATIVE_TYPEINFO
- __call_member_function_0(__cpp_eh_record.params.pExceptionObject, __throw_info->pmfnUnwind);
+ __call_member_function_0(__cpp_eh_record.params.pExceptionObject,
+ reinterpret_cast<void*>(__throw_info->pmfnUnwind));
#endif // _EH_RELATIVE_TYPEINFO
} else if (__type->properties & CT_IsWinRTHandle) {
const auto* __unknown = *static_cast<IUnknown* const*>(__cpp_eh_record.params.pExceptionObject);
More information about the libcxx-commits
mailing list