From b600a3555f0b12f7f6b2bfe3dd2fa2f10ec164a1 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Wed, 30 Nov 2016 21:38:46 -0800 Subject: [PATCH] Revert "OSX unwind workaround" --- src/Native/Runtime/unix/UnixContext.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Native/Runtime/unix/UnixContext.cpp b/src/Native/Runtime/unix/UnixContext.cpp index df84ae55392..02caacf8fde 100644 --- a/src/Native/Runtime/unix/UnixContext.cpp +++ b/src/Native/Runtime/unix/UnixContext.cpp @@ -332,12 +332,9 @@ static void GetContextPointer(unw_cursor_t *cursor, unw_context_t *unwContext, i // Update REGDISPLAY from the unw_cursor_t and unw_context_t void UnwindCursorToRegDisplay(unw_cursor_t *cursor, unw_context_t *unwContext, REGDISPLAY *regDisplay) { - //TODO: Workaround for unwind on OSX: See https://github.com/dotnet/corert/pull/2166 -#if !defined(__APPLE__) - #define GET_CONTEXT_POINTER(unwReg, rdReg) GetContextPointer(cursor, unwContext, unwReg, ®Display->p##rdReg); - GET_CONTEXT_POINTERS - #undef GET_CONTEXT_POINTER -#endif +#define GET_CONTEXT_POINTER(unwReg, rdReg) GetContextPointer(cursor, unwContext, unwReg, ®Display->p##rdReg); + GET_CONTEXT_POINTERS +#undef GET_CONTEXT_POINTER unw_get_reg(cursor, UNW_REG_IP, (unw_word_t *) ®Display->IP); unw_get_reg(cursor, UNW_REG_SP, (unw_word_t *) ®Display->SP);