llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-libunwind Author: None (llvmbot) <details> <summary>Changes</summary> Backport 0991d7b8fd01546aaf537a6238227100570f8236 Requested by: @<!-- -->mstorsjo --- Full diff: https://github.com/llvm/llvm-project/pull/181138.diff 1 Files Affected: - (modified) libunwind/src/Unwind-seh.cpp (+6-7) ``````````diff diff --git a/libunwind/src/Unwind-seh.cpp b/libunwind/src/Unwind-seh.cpp index 110c5987c3f1a..0b1930b44d1c6 100644 --- a/libunwind/src/Unwind-seh.cpp +++ b/libunwind/src/Unwind-seh.cpp @@ -163,7 +163,7 @@ _GCC_specific_handler(PEXCEPTION_RECORD ms_exc, PVOID frame, PCONTEXT ms_ctx, // If we were called by __libunwind_seh_personality(), indicate that // a handler was found; otherwise, initiate phase 2 by unwinding. if (ours && ms_exc->NumberParameters > 1) - return 4 /* ExceptionExecuteHandler in mingw */; + return static_cast<EXCEPTION_DISPOSITION>(4); // This should never happen in phase 2. if (IS_UNWINDING(ms_exc->ExceptionFlags)) _LIBUNWIND_ABORT("Personality indicated exception handler in phase 2!"); @@ -182,7 +182,7 @@ _GCC_specific_handler(PEXCEPTION_RECORD ms_exc, PVOID frame, PCONTEXT ms_ctx, // a handler was found; otherwise, it's time to initiate a collided // unwind to the target. if (ours && !IS_UNWINDING(ms_exc->ExceptionFlags) && ms_exc->NumberParameters > 1) - return 4 /* ExceptionExecuteHandler in mingw */; + return static_cast<EXCEPTION_DISPOSITION>(4); // This should never happen in phase 1. if (!IS_UNWINDING(ms_exc->ExceptionFlags)) _LIBUNWIND_ABORT("Personality installed context during phase 1!"); @@ -259,13 +259,12 @@ __libunwind_seh_personality(int version, _Unwind_Action state, (void *)disp_ctx->LanguageHandler, (void *)&ms_exc, (void *)disp_ctx->EstablisherFrame, (void *)disp_ctx->ContextRecord, (void *)disp_ctx); - EXCEPTION_DISPOSITION ms_act = disp_ctx->LanguageHandler(&ms_exc, - (PVOID)disp_ctx->EstablisherFrame, - disp_ctx->ContextRecord, - disp_ctx); + int ms_act = static_cast<int>( + disp_ctx->LanguageHandler(&ms_exc, (PVOID)disp_ctx->EstablisherFrame, + disp_ctx->ContextRecord, disp_ctx)); _LIBUNWIND_TRACE_UNWINDING("__libunwind_seh_personality() LanguageHandler " "returned %d", - (int)ms_act); + ms_act); switch (ms_act) { case ExceptionContinueExecution: return _URC_END_OF_STACK; case ExceptionContinueSearch: return _URC_CONTINUE_UNWIND; `````````` </details> https://github.com/llvm/llvm-project/pull/181138 _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
