Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Revert "OSX unwind workaround" #2294

Merged
merged 1 commit into from
Dec 1, 2016
Merged

Revert "OSX unwind workaround" #2294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/Native/Runtime/unix/UnixContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, &regDisplay->p##rdReg);
GET_CONTEXT_POINTERS
#undef GET_CONTEXT_POINTER
#endif
#define GET_CONTEXT_POINTER(unwReg, rdReg) GetContextPointer(cursor, unwContext, unwReg, &regDisplay->p##rdReg);
GET_CONTEXT_POINTERS
#undef GET_CONTEXT_POINTER

unw_get_reg(cursor, UNW_REG_IP, (unw_word_t *) &regDisplay->IP);
unw_get_reg(cursor, UNW_REG_SP, (unw_word_t *) &regDisplay->SP);
Expand Down