From 7586d68184353eced0c2763da23944fe927d40b7 Mon Sep 17 00:00:00 2001 From: SaeHie Park Date: Mon, 5 Dec 2016 14:28:21 +0900 Subject: [PATCH] [x86/Linux] Fix no known conversion from 'void ()' to 'void *' Fix compile error for x86/Linux - this will fix "no known conversion from 'void ()' to 'void *'" for "CallRtlUnwindSafe" - for compiler clang 3.8 --- src/vm/i386/excepx86.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vm/i386/excepx86.cpp b/src/vm/i386/excepx86.cpp index dad65882d8d2..8d9edd0c2477 100644 --- a/src/vm/i386/excepx86.cpp +++ b/src/vm/i386/excepx86.cpp @@ -53,13 +53,15 @@ VOID STDCALL ResumeAtJitEHHelper(EHContext *pContext); int STDCALL CallJitEHFilterHelper(size_t *pShadowSP, EHContext *pContext); VOID STDCALL CallJitEHFinallyHelper(size_t *pShadowSP, EHContext *pContext); +typedef void (*RtlUnwindCallbackType)(void); + BOOL CallRtlUnwind(EXCEPTION_REGISTRATION_RECORD *pEstablisherFrame, - void *callback, + RtlUnwindCallbackType callback, EXCEPTION_RECORD *pExceptionRecord, void *retval); BOOL CallRtlUnwindSafe(EXCEPTION_REGISTRATION_RECORD *pEstablisherFrame, - void *callback, + RtlUnwindCallbackType callback, EXCEPTION_RECORD *pExceptionRecord, void *retval); } @@ -608,7 +610,7 @@ EXCEPTION_DISPOSITION ClrDebuggerDoUnwindAndIntercept(EXCEPTION_REGISTRATION_REC // This rethrow issue does not affect COMPLUS exceptions since we always create a brand new exception // record for them in RaiseTheExceptionInternalOnly. BOOL CallRtlUnwindSafe(EXCEPTION_REGISTRATION_RECORD *pEstablisherFrame, - void *callback, + RtlUnwindCallbackType callback, EXCEPTION_RECORD *pExceptionRecord, void *retval) {