diff options
| author | Austin Wise <AustinWise@gmail.com> | 2017-03-05 17:51:40 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-03-05 17:51:40 -0800 |
| commit | 51e968b013e9b1582035f202e004ed024f747f4f (patch) | |
| tree | 25b0b82deb3392cbeacb3be81bbf3c29e11e81cb /src/vm/exceptionhandling.cpp | |
| parent | 118f88dc17c75800ca249330ea41a963d3bae306 (diff) | |
| download | coreclr-51e968b013e9b1582035f202e004ed024f747f4f.tar.gz coreclr-51e968b013e9b1582035f202e004ed024f747f4f.tar.bz2 coreclr-51e968b013e9b1582035f202e004ed024f747f4f.zip | |
Remove hosting methods that always return false (#9930)
* Remove CLRIoCompletionHosted as it always returns false.
* Remove CLRSyncHosted as it always returns false.
* Remove CLRMemoryHosted as it always returns false.
* Remove CLRTaskHosted as it always returns false.
* Remove CLRAssemblyHosted, CLRGCHosted,and CLRSecurityHosted.
They are not called.
* Remove IsThreadPoolHosted as it always returns false.
* Remove EnterRuntime and LeaveRuntime, as they do nothing.
* Add back calls to RevertIfImpersonated and GCX_PREEMP.
I accidentally deleted the call to RevertIfImpersonated instead of just
removing an extra parameter.
When I removed the HR_LEAVE_RUNTIME_HOLDER macro from windowsruntime.h,
I not only removed a LeaveRuntimeHolder but also a GCX_PREEMP. So I added
it back. The holder and GCX_PREEMP where only inserted when the
FEATURE_LEAVE_RUNTIME_HOLDER macro was defined. Since it is always defined,
I removed it. Also as I understand it, you would always want to have a
GCX_PREEMP before calling into the Windows API as not to block the GC,
so I'm not sure why you would want to disable it.
Diffstat (limited to 'src/vm/exceptionhandling.cpp')
| -rw-r--r-- | src/vm/exceptionhandling.cpp | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp index 4fa36f9d56..74a456de32 100644 --- a/src/vm/exceptionhandling.cpp +++ b/src/vm/exceptionhandling.cpp @@ -5863,30 +5863,6 @@ NOT_WIN64_ARG(IN ULONG MemoryStackFp), } #endif // _DEBUG - // We need to ReverseLeaveRuntime if we are unwinding (since there is no - // frame to do this for us... - if (IS_UNWINDING(pExceptionRecord->ExceptionFlags)) - { - BYTE bFlag; - -#ifdef _TARGET_AMD64_ - bFlag = *(BYTE*)(pDispatcherContext->ContextRecord->Rbp + UMTHUNKSTUB_HOST_NOTIFY_FLAG_RBPOFFSET); -#elif defined(_TARGET_ARM_) || defined(_TARGET_ARM64_) - // On ARM, we do not need to do anything here. If required, ReverseEnterRuntime should happen - // in the VM in UMThunkStubWorker via a holder so that during an exceptional case, we will - // automatically perform the ReverseLeaveRuntime. - bFlag = 0; -#else - bFlag = 0; - PORTABILITY_ASSERT("NYI -- UMThunkStubUnwindFrameChainHandler notify host of ReverseLeaveRuntime"); -#endif // _TARGET_AMD64_ - - if (0 != bFlag) - { - GetThread()->ReverseLeaveRuntime(); - } - } - EXCEPTION_DISPOSITION disposition = UMThunkUnwindFrameChainHandler( pExceptionRecord, MemoryStackFp, |