From 542cd9edff12ebe77ff6ae414f292c183003b2bb Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Thu, 1 Dec 2016 14:52:08 +0900 Subject: [PATCH 1/2] Adds Portable PopSEHRecords as NYI --- src/vm/i386/cgenx86.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/vm/i386/cgenx86.cpp b/src/vm/i386/cgenx86.cpp index cefeeef0f09b..6d036c9b9c95 100644 --- a/src/vm/i386/cgenx86.cpp +++ b/src/vm/i386/cgenx86.cpp @@ -1595,6 +1595,12 @@ extern "C" VOID STDCALL StubRareDisableTHROWWorker(Thread *pThread) pThread->HandleThreadAbort(); } +#ifdef FEATURE_PAL +VOID __cdecl PopSEHRecords(LPVOID pTargetSP) +{ + _ASSERTE("NYI"); +} +#else // FEATURE_PAL // Note that this logic is copied below, in PopSEHRecords __declspec(naked) VOID __cdecl PopSEHRecords(LPVOID pTargetSP) @@ -1616,6 +1622,7 @@ VOID __cdecl PopSEHRecords(LPVOID pTargetSP) retn } } +#endif // FEATURE_PAL ////////////////////////////////////////////////////////////////////////////// // From 834c140b34090e780ca4839fc1bb89ff51f19383 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Fri, 2 Dec 2016 07:54:04 +0900 Subject: [PATCH 2/2] Put portable PopSEHRecords in unixstubs.cpp --- src/vm/i386/cgenx86.cpp | 7 +------ src/vm/i386/unixstubs.cpp | 5 +++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vm/i386/cgenx86.cpp b/src/vm/i386/cgenx86.cpp index 6d036c9b9c95..a4ef9febc981 100644 --- a/src/vm/i386/cgenx86.cpp +++ b/src/vm/i386/cgenx86.cpp @@ -1595,12 +1595,7 @@ extern "C" VOID STDCALL StubRareDisableTHROWWorker(Thread *pThread) pThread->HandleThreadAbort(); } -#ifdef FEATURE_PAL -VOID __cdecl PopSEHRecords(LPVOID pTargetSP) -{ - _ASSERTE("NYI"); -} -#else // FEATURE_PAL +#ifndef FEATURE_PAL // Note that this logic is copied below, in PopSEHRecords __declspec(naked) VOID __cdecl PopSEHRecords(LPVOID pTargetSP) diff --git a/src/vm/i386/unixstubs.cpp b/src/vm/i386/unixstubs.cpp index e7f49577e429..86dd75da49c7 100644 --- a/src/vm/i386/unixstubs.cpp +++ b/src/vm/i386/unixstubs.cpp @@ -88,3 +88,8 @@ extern "C" { } }; + +VOID __cdecl PopSEHRecords(LPVOID pTargetSP) +{ + PORTABILITY_ASSERT("Implement for PAL"); +}