1 files changed, 2 insertions, 41 deletions

diff --git a/src/vm/i386/excepx86.cpp b/src/vm/i386/excepx86.cpp
index 97b4087797..c837b55b2a 100644
--- a/src/vm/i386/excepx86.cpp
+++ b/src/vm/i386/excepx86.cpp
@@ -475,10 +475,6 @@ EXCEPTION_DISPOSITION COMPlusAfterUnwind(
     LOG((LF_EH, LL_INFO1000, "COMPlusAfterUnwind: going to: pFunc:%#X, pStack:%#X\n",
         tct.pFunc, tct.pStack));
 
-    // TODO: UnwindFrames ends up calling into StackWalkFrames which is SO_INTOLERANT
-    //                 as is UnwindFrames, etc... Should we make COMPlusAfterUnwind SO_INTOLERANT???
-    ANNOTATION_VIOLATION(SOToleranceViolation);
-
     UnwindFrames(pThread, &tct);
 
 #ifdef DEBUGGING_SUPPORTED
@@ -649,7 +645,6 @@ CPFH_RealFirstPassHandler(                  // ExceptionContinueSearch, etc.
     STATIC_CONTRACT_THROWS;
     STATIC_CONTRACT_GC_TRIGGERS;
     STATIC_CONTRACT_MODE_COOPERATIVE;
-    STATIC_CONTRACT_SO_TOLERANT;
 
 #ifdef _DEBUG
     static int breakOnFirstPass = -1;
@@ -1079,7 +1074,6 @@ CPFH_RealFirstPassHandler(                  // ExceptionContinueSearch, etc.
 
 #ifdef FEATURE_CORRUPTING_EXCEPTIONS
         {
-            BEGIN_SO_INTOLERANT_CODE(GetThread());
             // Setup the state in current exception tracker indicating the corruption severity
             // of the active exception.
             CEHelper::SetupCorruptionSeverityForActiveException(bRethrownException, bNestedException, 
@@ -1088,8 +1082,6 @@ CPFH_RealFirstPassHandler(                  // ExceptionContinueSearch, etc.
             // Failfast if exception indicates corrupted process state   
             if (pExInfo->GetCorruptionSeverity() == ProcessCorrupting)
                 EEPOLICY_HANDLE_FATAL_ERROR(exceptionCode);
-                
-            END_SO_INTOLERANT_CODE;
         }
 #endif // FEATURE_CORRUPTING_EXCEPTIONS
 
@@ -1146,10 +1138,7 @@ CPFH_RealFirstPassHandler(                  // ExceptionContinueSearch, etc.
     if (bRethrownException || bNestedException)
     {
         _ASSERTE(pExInfo->m_pPrevNestedInfo != NULL);
-        
-        BEGIN_SO_INTOLERANT_CODE(GetThread());
         SetStateForWatsonBucketing(bRethrownException, pExInfo->GetPreviousExceptionTracker()->GetThrowableAsHandle());
-        END_SO_INTOLERANT_CODE;
     }
 
 #ifdef DEBUGGING_SUPPORTED
@@ -1708,7 +1697,7 @@ EXCEPTION_HANDLER_IMPL(COMPlusFrameHandler)
     Thread *pThread = GetThread();
     if ((pExceptionRecord->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND)) == 0)
     {
-        if (IsSOExceptionCode(pExceptionRecord->ExceptionCode))
+        if (pExceptionRecord->ExceptionCode == STATUS_STACK_OVERFLOW)
         {
             EEPolicy::HandleStackOverflow(SOD_ManagedFrameHandler, (void*)pEstablisherFrame);
 
@@ -1736,15 +1725,6 @@ EXCEPTION_HANDLER_IMPL(COMPlusFrameHandler)
 
             return ExceptionContinueSearch;
         }
-        else
-        {
-#ifdef FEATURE_STACK_PROBE
-            if (GetEEPolicy()->GetActionOnFailure(FAIL_StackOverflow) == eRudeUnloadAppDomain)
-            {
-                RetailStackProbe(static_cast<unsigned int>(ADJUST_PROBE(BACKOUT_CODE_STACK_LIMIT)), pThread);
-            }
-#endif
-        }
     }
     else
     {
@@ -1758,7 +1738,7 @@ EXCEPTION_HANDLER_IMPL(COMPlusFrameHandler)
             exceptionCode = GetCurrentExceptionCode();
         }
 
-        if (IsSOExceptionCode(exceptionCode))
+        if (exceptionCode == STATUS_STACK_OVERFLOW)
         {
             // We saved the context during the first pass in case the stack overflow exception is
             // unhandled and Watson dump code needs it.  Now we are in the second pass, therefore
@@ -1799,9 +1779,6 @@ EXCEPTION_HANDLER_IMPL(COMPlusFrameHandler)
         }
     }
 
-    // <TODO> .  We need to probe here, but can't introduce destructors etc. </TODO>
-    BEGIN_CONTRACT_VIOLATION(SOToleranceViolation);
-
     if (pExceptionRecord->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND))
     {
         retVal =  CPFH_UnwindHandler(pExceptionRecord,
@@ -1823,8 +1800,6 @@ EXCEPTION_HANDLER_IMPL(COMPlusFrameHandler)
 
     }
 
-    END_CONTRACT_VIOLATION;
-
     return retVal;
 } // COMPlusFrameHandler()
 
@@ -1839,7 +1814,6 @@ NOINLINE LPVOID COMPlusEndCatchWorker(Thread * pThread)
     STATIC_CONTRACT_THROWS;
     STATIC_CONTRACT_GC_TRIGGERS;
     STATIC_CONTRACT_MODE_COOPERATIVE;
-    STATIC_CONTRACT_SO_INTOLERANT;
 
     LOG((LF_EH, LL_INFO1000, "COMPlusPEndCatch:called with "
         "pThread:0x%x\n",pThread));
@@ -1850,9 +1824,6 @@ NOINLINE LPVOID COMPlusEndCatchWorker(Thread * pThread)
 
     void* esp = NULL;
 
-    // @todo .  We need to probe in the EH code, but can't introduce destructors etc.
-    BEGIN_CONTRACT_VIOLATION(SOToleranceViolation);
-
     // Notify the profiler that the catcher has finished running
     // IL stubs don't contain catch blocks so inability to perform this check does not matter.
     // if (!pFunc->IsILStub())
@@ -1905,8 +1876,6 @@ NOINLINE LPVOID COMPlusEndCatchWorker(Thread * pThread)
     pThread->SyncManagedExceptionState(fIsDebuggerHelperThread);
 
     LOG((LF_EH, LL_INFO1000, "COMPlusPEndCatch: esp=%p\n", esp));
-   
-    END_CONTRACT_VIOLATION;
 
     return esp;
 }
@@ -1929,7 +1898,6 @@ LPVOID STDCALL COMPlusEndCatch(LPVOID ebp, DWORD ebx, DWORD edi, DWORD esi, LPVO
     STATIC_CONTRACT_THROWS;
     STATIC_CONTRACT_GC_TRIGGERS;
     STATIC_CONTRACT_MODE_COOPERATIVE;
-    STATIC_CONTRACT_SO_INTOLERANT;
 
     ETW::ExceptionLog::ExceptionCatchEnd();
     ETW::ExceptionLog::ExceptionThrownEnd();
@@ -2066,7 +2034,6 @@ VOID UnwindExceptionTrackerAndResumeInInterceptionFrame(ExInfo* pExInfo, EHConte
     STATIC_CONTRACT_NOTHROW;
     STATIC_CONTRACT_GC_NOTRIGGER;
     STATIC_CONTRACT_MODE_COOPERATIVE;
-    STATIC_CONTRACT_SO_TOLERANT;
 
     _ASSERTE(pExInfo && context);
 
@@ -2088,7 +2055,6 @@ BOOL PopNestedExceptionRecords(LPVOID pTargetSP, BOOL bCheckForUnknownHandlers)
     // No CONTRACT here, because we can't run the risk of it pushing any SEH into the current method.
     STATIC_CONTRACT_NOTHROW;
     STATIC_CONTRACT_GC_NOTRIGGER;
-    STATIC_CONTRACT_SO_TOLERANT;
 
     PEXCEPTION_REGISTRATION_RECORD pEHR = GetCurrentSEHRecord();
 
@@ -3301,7 +3267,6 @@ int CallJitEHFilterWorker(size_t *pShadowSP, EHContext *pContext)
     STATIC_CONTRACT_THROWS;
     STATIC_CONTRACT_GC_TRIGGERS;
     STATIC_CONTRACT_MODE_COOPERATIVE;
-    STATIC_CONTRACT_SO_INTOLERANT;
 
     int retVal = EXCEPTION_CONTINUE_SEARCH;
 
@@ -3554,8 +3519,6 @@ EXCEPTION_HANDLER_IMPL(UMThunkPrestubHandler)
 
     EXCEPTION_DISPOSITION retval = ExceptionContinueSearch;
     
-    BEGIN_CONTRACT_VIOLATION(SOToleranceViolation);
-    
     // We must forward to the COMPlusFrameHandler. This will unwind the Frame Chain up to here, and also leave the
     // preemptive GC mode set correctly.
     retval = EXCEPTION_HANDLER_FWD(COMPlusFrameHandler);
@@ -3582,8 +3545,6 @@ EXCEPTION_HANDLER_IMPL(UMThunkPrestubHandler)
         pFrame->Pop(pThread);
     }
 
-    END_CONTRACT_VIOLATION;
-    
     return retval;
 }