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/eepolicy.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/eepolicy.cpp')
| -rw-r--r-- | src/vm/eepolicy.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/vm/eepolicy.cpp b/src/vm/eepolicy.cpp index 702dcf123e..be5fa00ee5 100644 --- a/src/vm/eepolicy.cpp +++ b/src/vm/eepolicy.cpp @@ -924,13 +924,7 @@ void EEPolicy::HandleStackOverflow(StackOverflowDetector detector, void * pLimit switch (detector) { case SOD_ManagedFrameHandler: - if (!pThread->PreemptiveGCDisabled() && !fInCLR && fInSoTolerant - && - // Before we call managed code, we probe inside ReverseEnterRuntime for BACKOUT_CODE_STACK_LIMIT pages - // If we hit hard so here, we are still in our stub - (!CLRTaskHosted() || (UINT_PTR)pThread->m_pFrame - pThread->GetLastAllowableStackAddress() >= - ADJUST_PROBE(BACKOUT_CODE_STACK_LIMIT) * OS_PAGE_SIZE) - ) + if (!pThread->PreemptiveGCDisabled() && !fInCLR && fInSoTolerant) { // Managed exception handler detects SO, but the thread is in preemptive GC mode, // and the IP is outside CLR. This means we are inside a PINVOKE call. |