diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-02-22 23:43:30 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-02-22 15:43:30 +0100 |
| commit | 1f5cae07e65d646fd57fdca7376d4b2f1dccad00 (patch) | |
| tree | d89e5551e9c3e781285f33cc4d8c74dfc9d2715c /src/vm/exceptionhandling.cpp | |
| parent | 0b4e58ac7a455640a5410b6f647ca3044426ea56 (diff) | |
| download | coreclr-1f5cae07e65d646fd57fdca7376d4b2f1dccad00.tar.gz coreclr-1f5cae07e65d646fd57fdca7376d4b2f1dccad00.tar.bz2 coreclr-1f5cae07e65d646fd57fdca7376d4b2f1dccad00.zip | |
Clean up ClrUnwindEx (#9482)
* Clean up ClrUnwindEx
Diffstat (limited to 'src/vm/exceptionhandling.cpp')
| -rw-r--r-- | src/vm/exceptionhandling.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp index 29906c5a90..1e51467789 100644 --- a/src/vm/exceptionhandling.cpp +++ b/src/vm/exceptionhandling.cpp @@ -79,12 +79,6 @@ static void DoEHLog(DWORD lvl, __in_z const char *fmt, ...); TrackerAllocator g_theTrackerAllocator; -void __declspec(noinline) -ClrUnwindEx(EXCEPTION_RECORD* pExceptionRecord, - UINT_PTR ReturnValue, - UINT_PTR TargetIP, - UINT_PTR TargetFrameSp); - bool FixNonvolatileRegisters(UINT_PTR uOriginalSP, Thread* pThread, CONTEXT* pContextRecord, @@ -4112,6 +4106,7 @@ void ExceptionTracker::MakeCallbacksRelatedToHandler( } } +#ifdef DEBUGGER_EXCEPTION_INTERCEPTION_SUPPORTED //--------------------------------------------------------------------------------------- // // This function is called by DefaultCatchHandler() to intercept an exception and start an unwind. @@ -4148,6 +4143,7 @@ EXCEPTION_DISPOSITION ClrDebuggerDoUnwindAndIntercept(X86_FIRST_ARG(EXCEPTION_RE UNREACHABLE(); } +#endif // DEBUGGER_EXCEPTION_INTERCEPTION_SUPPORTED #endif // DEBUGGING_SUPPORTED #ifdef _DEBUG @@ -5116,9 +5112,9 @@ BOOL HandleHardwareException(PAL_SEHException* ex) #endif // FEATURE_PAL +#ifndef FEATURE_PAL void ClrUnwindEx(EXCEPTION_RECORD* pExceptionRecord, UINT_PTR ReturnValue, UINT_PTR TargetIP, UINT_PTR TargetFrameSp) { -#ifndef FEATURE_PAL PVOID TargetFrame = (PVOID)TargetFrameSp; CONTEXT ctx; @@ -5129,13 +5125,10 @@ void ClrUnwindEx(EXCEPTION_RECORD* pExceptionRecord, UINT_PTR ReturnValue, UINT_ &ctx, NULL); // HistoryTable -#else // !FEATURE_PAL - PORTABILITY_ASSERT("UNIXTODO: Implement unwinding for PAL"); -#endif // !FEATURE_PAL - // doesn't return UNREACHABLE(); } +#endif // !FEATURE_PAL void TrackerAllocator::Init() { |