Remove all traces of FEATURE_STACK_PROBE. (#22149)

1 files changed, 17 insertions, 81 deletions

diff --git a/src/vm/stdinterfaces_wrapper.cpp b/src/vm/stdinterfaces_wrapper.cpp
index e23922fe04..cf0b1e6b74 100644
--- a/src/vm/stdinterfaces_wrapper.cpp
+++ b/src/vm/stdinterfaces_wrapper.cpp
@@ -256,7 +256,6 @@ inline BOOL IsCurrentDomainValid(ComCallWrapper* pWrap, Thread* pThread)
         NOTHROW;
         GC_TRIGGERS;
         MODE_ANY;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pWrap));
         PRECONDITION(CheckPointer(pThread));
     }
@@ -275,7 +274,7 @@ inline BOOL IsCurrentDomainValid(ComCallWrapper* pWrap, Thread* pThread)
 
 BOOL IsCurrentDomainValid(ComCallWrapper* pWrap)
 {
-    CONTRACTL { NOTHROW; GC_TRIGGERS; MODE_ANY; SO_TOLERANT; } CONTRACTL_END;
+    CONTRACTL { NOTHROW; GC_TRIGGERS; MODE_ANY; } CONTRACTL_END;
 
     return IsCurrentDomainValid(pWrap, GetThread());
 }
@@ -312,7 +311,6 @@ VOID AppDomainDoCallBack(ComCallWrapper* pWrap, ADCallBackFcnType pTarget, LPVOI
         DISABLED(NOTHROW);
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pWrap));
         PRECONDITION(CheckPointer(pTarget));
         PRECONDITION(CheckPointer(pArgs));
@@ -356,7 +354,6 @@ VOID __stdcall Unknown_QueryInterface_CallBack(LPVOID ptr)
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(ptr));
     }
     CONTRACTL_END;
@@ -383,7 +380,6 @@ HRESULT __stdcall Unknown_QueryInterface(IUnknown* pUnk, REFIID riid, void** ppv
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pUnk));
         PRECONDITION(CheckPointer(ppv, NULL_OK));
     }
@@ -417,7 +413,6 @@ HRESULT __stdcall Unknown_QueryInterface_ICCW(IUnknown *pUnk, REFIID riid, void
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pUnk));
         PRECONDITION(CheckPointer(ppv, NULL_OK));
     }
@@ -498,7 +493,7 @@ VOID __stdcall DirtyCast_Assert(IUnknown* pUnk)
 ULONG __stdcall Unknown_AddRef(IUnknown* pUnk)
 {
     // Ensure the Thread is available for contracts and other users of the Thread, but don't do any of
-    // the other "entering managed code" work like going to SO_INTOLERANT or checking for reentrancy.
+    // the other "entering managed code" work like checking for reentrancy.
     // We don't really need to "enter" the runtime to do an interlocked increment on a refcount, so 
     // all of that stuff should be isolated to rare paths here.
     SetupThreadForComCall(-1);
@@ -508,7 +503,7 @@ ULONG __stdcall Unknown_AddRef(IUnknown* pUnk)
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        ENTRY_POINT;        // implies SO_TOLERANT
+        ENTRY_POINT;
     }
     CONTRACTL_END;
 
@@ -521,7 +516,7 @@ ULONG __stdcall Unknown_AddRef(IUnknown* pUnk)
 ULONG __stdcall Unknown_Release(IUnknown* pUnk)
 {
     // Ensure the Thread is available for contracts and other users of the Thread, but don't do any of
-    // the other "entering managed code" work like going to SO_INTOLERANT or checking for reentrancy.
+    // the other "entering managed code" work like checking for reentrancy.
     // We don't really need to "enter" the runtime to do an interlocked decrement on a refcount, so 
     // all of that stuff should be isolated to rare paths here.
     SetupThreadForComCall(-1);
@@ -531,7 +526,7 @@ ULONG __stdcall Unknown_Release(IUnknown* pUnk)
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        ENTRY_POINT;        // implies SO_TOLERANT
+        ENTRY_POINT;
     }
     CONTRACTL_END;
 
@@ -544,7 +539,7 @@ ULONG __stdcall Unknown_Release(IUnknown* pUnk)
 ULONG __stdcall Unknown_AddRefInner(IUnknown* pUnk)
 {
     // Ensure the Thread is available for contracts and other users of the Thread, but don't do any of
-    // the other "entering managed code" work like going to SO_INTOLERANT or checking for reentrancy.
+    // the other "entering managed code" work like checking for reentrancy.
     // We don't really need to "enter" the runtime to do an interlocked increment on a refcount, so 
     // all of that stuff should be isolated to rare paths here.
     SetupThreadForComCall(-1);
@@ -554,7 +549,7 @@ ULONG __stdcall Unknown_AddRefInner(IUnknown* pUnk)
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        ENTRY_POINT;        // implies SO_TOLERANT
+        ENTRY_POINT;
     }
     CONTRACTL_END;
 
@@ -567,7 +562,7 @@ ULONG __stdcall Unknown_AddRefInner(IUnknown* pUnk)
 ULONG __stdcall Unknown_ReleaseInner(IUnknown* pUnk)
 {
     // Ensure the Thread is available for contracts and other users of the Thread, but don't do any of
-    // the other "entering managed code" work like going to SO_INTOLERANT or checking for reentrancy.
+    // the other "entering managed code" work like checking for reentrancy.
     // We don't really need to "enter" the runtime to do an interlocked decrement on a refcount, so 
     // all of that stuff should be isolated to rare paths here.
     SetupThreadForComCall(-1);
@@ -577,7 +572,7 @@ ULONG __stdcall Unknown_ReleaseInner(IUnknown* pUnk)
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        ENTRY_POINT;        // implies SO_TOLERANT
+        ENTRY_POINT;
     }
     CONTRACTL_END;
 
@@ -590,7 +585,7 @@ ULONG __stdcall Unknown_ReleaseInner(IUnknown* pUnk)
 ULONG __stdcall Unknown_AddRefSpecial(IUnknown* pUnk)
 {
     // Ensure the Thread is available for contracts and other users of the Thread, but don't do any of
-    // the other "entering managed code" work like going to SO_INTOLERANT or checking for reentrancy.
+    // the other "entering managed code" work like checking for reentrancy.
     // We don't really need to "enter" the runtime to do an interlocked increment on a refcount, so 
     // all of that stuff should be isolated to rare paths here.
     SetupThreadForComCall(-1);
@@ -600,7 +595,7 @@ ULONG __stdcall Unknown_AddRefSpecial(IUnknown* pUnk)
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        ENTRY_POINT;        // implies SO_TOLERANT
+        ENTRY_POINT;
     }
     CONTRACTL_END;
 
@@ -613,7 +608,7 @@ ULONG __stdcall Unknown_AddRefSpecial(IUnknown* pUnk)
 ULONG __stdcall Unknown_ReleaseSpecial(IUnknown* pUnk)
 {
     // Ensure the Thread is available for contracts and other users of the Thread, but don't do any of
-    // the other "entering managed code" work like going to SO_INTOLERANT or checking for reentrancy.
+    // the other "entering managed code" work like checking for reentrancy.
     // We don't really need to "enter" the runtime to do an interlocked decrement on a refcount, so 
     // all of that stuff should be isolated to rare paths here.
     SetupThreadForComCall(-1);
@@ -623,7 +618,7 @@ ULONG __stdcall Unknown_ReleaseSpecial(IUnknown* pUnk)
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        ENTRY_POINT;        // implies SO_TOLERANT
+        ENTRY_POINT;
     }
     CONTRACTL_END;
 
@@ -640,7 +635,6 @@ HRESULT __stdcall Unknown_QueryInterface_IErrorInfo(IUnknown* pUnk, REFIID riid,
     SetupForComCallHRNoCheckCanRunManagedCode();
 
     WRAPPER_NO_CONTRACT;
-    STATIC_CONTRACT_SO_TOLERANT;
 
     HRESULT hr = S_OK;
     if (!CanRunManagedCode(LoaderLockCheck::ForCorrectness))
@@ -672,7 +666,6 @@ ULONG __stdcall Unknown_ReleaseSpecial_IErrorInfo(IUnknown* pUnk)
     SetupForComCallDWORDNoCheckCanRunManagedCode();
 
     WRAPPER_NO_CONTRACT;    
-    STATIC_CONTRACT_SO_TOLERANT;
 
     // <TODO>Address this violation in context of bug 27409</TODO>
     CONTRACT_VIOLATION(GCViolation);
@@ -736,7 +729,6 @@ HRESULT __stdcall ClassInfo_GetClassInfo_Wrapper(IUnknown* pUnk, ITypeInfo** ppT
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pUnk));
         PRECONDITION(CheckPointer(ppTI, NULL_OK));
     }
@@ -792,7 +784,6 @@ SupportsErroInfo_IntfSupportsErrorInfo_Wrapper(IUnknown* pUnk, REFIID riid)
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pUnk));
     }
     CONTRACTL_END;
@@ -845,7 +836,6 @@ HRESULT __stdcall ErrorInfo_GetDescription_Wrapper(IUnknown* pUnk, BSTR* pbstrDe
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pUnk));
         PRECONDITION(CheckPointer(pbstrDescription, NULL_OK));
     }
@@ -896,7 +886,6 @@ HRESULT __stdcall ErrorInfo_GetGUID_Wrapper(IUnknown* pUnk, GUID* pguid)
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pUnk));
         PRECONDITION(CheckPointer(pguid, NULL_OK));
     }
@@ -947,7 +936,6 @@ HRESULT _stdcall ErrorInfo_GetHelpContext_Wrapper(IUnknown* pUnk, DWORD* pdwHelp
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pUnk));
         PRECONDITION(CheckPointer(pdwHelpCtxt, NULL_OK));
     }
@@ -998,7 +986,6 @@ HRESULT __stdcall ErrorInfo_GetHelpFile_Wrapper(IUnknown* pUnk, BSTR* pbstrHelpF
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pUnk));
         PRECONDITION(CheckPointer(pbstrHelpFile, NULL_OK));
     }
@@ -1049,7 +1036,6 @@ HRESULT __stdcall ErrorInfo_GetSource_Wrapper(IUnknown* pUnk, BSTR* pbstrSource)
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pUnk));
         PRECONDITION(CheckPointer(pbstrSource, NULL_OK));
     }
@@ -1108,7 +1094,6 @@ HRESULT __stdcall Dispatch_GetTypeInfoCount_Wrapper(IDispatch* pDisp, unsigned i
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(pctinfo, NULL_OK));
     }
@@ -1161,7 +1146,6 @@ HRESULT __stdcall Dispatch_GetTypeInfo_Wrapper(IDispatch* pDisp, unsigned int it
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(pptinfo, NULL_OK));
     }
@@ -1218,7 +1202,6 @@ HRESULT __stdcall Dispatch_GetIDsOfNames_Wrapper(IDispatch* pDisp, REFIID riid,
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(rgszNames, NULL_OK));
         PRECONDITION(CheckPointer(rgdispid, NULL_OK));
@@ -1265,7 +1248,6 @@ HRESULT __stdcall InternalDispatchImpl_GetIDsOfNames_Wrapper(IDispatch* pDisp, R
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(rgszNames, NULL_OK));
         PRECONDITION(CheckPointer(rgdispid, NULL_OK));
@@ -1323,15 +1305,6 @@ HRESULT __stdcall Dispatch_Invoke_Wrapper(IDispatch* pDisp, DISPID dispidMember,
     HRESULT hrRetVal = S_OK;
 
 #ifdef FEATURE_CORRUPTING_EXCEPTIONS
-    // SetupForComCallHR uses "SO_INTOLERANT_CODE_NOTHROW" to setup the SO-Intolerant transition
-    // for COM Interop. However, "SO_INTOLERANT_CODE_NOTHROW" expects that no exception can escape
-    // through this boundary but all it does is (in addition to checking that no exception has escaped it)
-    // do stack probing.
-    //
-    // However, Corrupting Exceptions [CE] can escape the COM Interop boundary. Thus, to address that scenario,
-    // we use the macro below that uses BEGIN_SO_INTOLERANT_CODE_NOTHROW to do the equivalent of 
-    // SO_INTOLERANT_CODE_NOTHROW and yet allow for CEs to escape through. Since there will be a corresponding
-    // END_SO_INTOLERANT_CODE, the call is splitted into two parts: the Begin and End (see below).
     BeginSetupForComCallHRWithEscapingCorruptingExceptions();
 #else // !FEATURE_CORRUPTING_EXCEPTIONS
     SetupForComCallHR();
@@ -1343,7 +1316,6 @@ HRESULT __stdcall Dispatch_Invoke_Wrapper(IDispatch* pDisp, DISPID dispidMember,
         THROWS; // Dispatch_Invoke_CallBack can throw
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(pdispparams, NULL_OK));
         PRECONDITION(CheckPointer(pvarResult, NULL_OK));
@@ -1399,7 +1371,6 @@ HRESULT __stdcall InternalDispatchImpl_Invoke_Wrapper(IDispatch* pDisp, DISPID d
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(pdispparams, NULL_OK));
         PRECONDITION(CheckPointer(pvarResult, NULL_OK));
@@ -1457,7 +1428,6 @@ HRESULT __stdcall DispatchEx_GetTypeInfoCount_Wrapper(IDispatchEx* pDisp, unsign
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(pctinfo, NULL_OK));
     }
@@ -1510,7 +1480,6 @@ HRESULT __stdcall DispatchEx_GetTypeInfo_Wrapper(IDispatchEx* pDisp, unsigned in
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(pptinfo, NULL_OK));
     }
@@ -1567,7 +1536,6 @@ HRESULT __stdcall DispatchEx_GetIDsOfNames_Wrapper(IDispatchEx* pDisp, REFIID ri
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(rgszNames, NULL_OK));
         PRECONDITION(CheckPointer(rgdispid, NULL_OK));
@@ -1630,7 +1598,6 @@ HRESULT __stdcall DispatchEx_Invoke_Wrapper(IDispatchEx* pDisp, DISPID dispidMem
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(pdispparams, NULL_OK));
         PRECONDITION(CheckPointer(pvarResult, NULL_OK));
@@ -1685,7 +1652,6 @@ HRESULT __stdcall DispatchEx_DeleteMemberByDispID_Wrapper(IDispatchEx* pDisp, DI
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
     }
     CONTRACTL_END;
@@ -1736,7 +1702,6 @@ HRESULT __stdcall DispatchEx_DeleteMemberByName_Wrapper(IDispatchEx* pDisp, BSTR
         NOTHROW; 
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
     }
     CONTRACTL_END;
@@ -1787,7 +1752,6 @@ HRESULT __stdcall DispatchEx_GetMemberName_Wrapper(IDispatchEx* pDisp, DISPID id
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(pbstrName, NULL_OK));
     }
@@ -1840,7 +1804,6 @@ HRESULT __stdcall DispatchEx_GetDispID_Wrapper(IDispatchEx* pDisp, BSTR bstrName
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(pid, NULL_OK));
     }
@@ -1894,7 +1857,6 @@ HRESULT __stdcall DispatchEx_GetMemberProperties_Wrapper(IDispatchEx* pDisp, DIS
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(pgrfdex, NULL_OK));
     }
@@ -1945,7 +1907,6 @@ HRESULT __stdcall DispatchEx_GetNameSpaceParent_Wrapper(IDispatchEx* pDisp, IUnk
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(ppunk, NULL_OK));
     }
@@ -1998,7 +1959,6 @@ HRESULT __stdcall DispatchEx_GetNextDispID_Wrapper(IDispatchEx* pDisp, DWORD grf
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(pid, NULL_OK));
     }
@@ -2058,7 +2018,6 @@ HRESULT __stdcall DispatchEx_InvokeEx_Wrapper(IDispatchEx* pDisp, DISPID id, LCI
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pDisp));
         PRECONDITION(CheckPointer(pdp, NULL_OK));
         PRECONDITION(CheckPointer(pVarRes, NULL_OK));
@@ -2116,7 +2075,6 @@ HRESULT __stdcall Inspectable_GetIIDs_Wrapper(IInspectable *pInsp, ULONG *iidCou
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pInsp));
     }
     CONTRACTL_END;
@@ -2166,7 +2124,6 @@ HRESULT __stdcall Inspectable_GetRuntimeClassName_Wrapper(IInspectable *pInsp, H
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pInsp));
     }
     CONTRACTL_END;
@@ -2187,7 +2144,6 @@ HRESULT __stdcall Inspectable_GetTrustLevel_Wrapper(IInspectable *pInsp, TrustLe
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pInsp));
     }
     CONTRACTL_END;
@@ -2242,7 +2198,6 @@ HRESULT __stdcall WeakReferenceSource_GetWeakReference_Wrapper(IWeakReferenceSou
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pRefSrc));
     }
     CONTRACTL_END;
@@ -2304,7 +2259,6 @@ HRESULT __stdcall Marshal_GetUnmarshalClass_Wrapper(IMarshal* pMarsh, REFIID rii
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pMarsh));
         PRECONDITION(CheckPointer(pv, NULL_OK));
         PRECONDITION(CheckPointer(pvDestContext, NULL_OK));
@@ -2368,7 +2322,6 @@ HRESULT __stdcall Marshal_GetMarshalSizeMax_Wrapper(IMarshal* pMarsh, REFIID rii
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pMarsh));
         PRECONDITION(CheckPointer(pv, NULL_OK));
         PRECONDITION(CheckPointer(pvDestContext, NULL_OK));
@@ -2430,7 +2383,6 @@ HRESULT __stdcall Marshal_MarshalInterface_Wrapper(IMarshal* pMarsh, LPSTREAM pS
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pMarsh));
         PRECONDITION(CheckPointer(pv, NULL_OK));
         PRECONDITION(CheckPointer(pvDestContext, NULL_OK));
@@ -2486,7 +2438,6 @@ HRESULT __stdcall Marshal_UnmarshalInterface_Wrapper(IMarshal* pMarsh, LPSTREAM
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pMarsh));
         PRECONDITION(CheckPointer(pStm, NULL_OK));
         PRECONDITION(CheckPointer(ppvObj, NULL_OK));
@@ -2539,7 +2490,6 @@ HRESULT __stdcall Marshal_ReleaseMarshalData_Wrapper(IMarshal* pMarsh, LPSTREAM
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pMarsh));
         PRECONDITION(CheckPointer(pStm, NULL_OK));
     }
@@ -2590,7 +2540,6 @@ HRESULT __stdcall Marshal_DisconnectObject_Wrapper(IMarshal* pMarsh, ULONG dwRes
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pMarsh));
     }
     CONTRACTL_END;
@@ -2643,7 +2592,6 @@ HRESULT __stdcall ConnectionPointContainer_EnumConnectionPoints_Wrapper(IUnknown
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pUnk));
         PRECONDITION(CheckPointer(ppEnum, NULL_OK));
     }
@@ -2696,7 +2644,6 @@ HRESULT __stdcall ConnectionPointContainer_FindConnectionPoint_Wrapper(IUnknown*
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pUnk));
         PRECONDITION(CheckPointer(ppCP, NULL_OK));
     }
@@ -2757,7 +2704,6 @@ HRESULT __stdcall ObjectSafety_GetInterfaceSafetyOptions_Wrapper(IUnknown* pUnk,
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pUnk));
         PRECONDITION(CheckPointer(pdwSupportedOptions, NULL_OK));
         PRECONDITION(CheckPointer(pdwEnabledOptions, NULL_OK));
@@ -2816,7 +2762,6 @@ HRESULT __stdcall ObjectSafety_SetInterfaceSafetyOptions_Wrapper(IUnknown* pUnk,
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pUnk));
     }
     CONTRACTL_END;
@@ -2866,7 +2811,6 @@ HRESULT __stdcall ICustomPropertyProvider_GetProperty_Wrapper(IUnknown *pPropert
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pPropertyProvider));
     }
     CONTRACTL_END;
@@ -2918,7 +2862,6 @@ HRESULT __stdcall ICustomPropertyProvider_GetIndexedProperty_Wrapper(IUnknown *p
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pPropertyProvider));
     }
     CONTRACTL_END;
@@ -2964,7 +2907,6 @@ HRESULT __stdcall ICustomPropertyProvider_GetStringRepresentation_Wrapper(IUnkno
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pPropertyProvider));
     }
     CONTRACTL_END;
@@ -3009,7 +2951,6 @@ HRESULT __stdcall ICustomPropertyProvider_GetType_Wrapper(IUnknown *pPropertyPro
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pPropertyProvider));
     }
     CONTRACTL_END;
@@ -3054,7 +2995,6 @@ HRESULT __stdcall  IStringable_ToString_Wrapper(IUnknown *pStringable,
         NOTHROW;
         GC_TRIGGERS;
         MODE_PREEMPTIVE;
-        SO_TOLERANT;
         PRECONDITION(CheckPointer(pStringable));
     }
     CONTRACTL_END;
@@ -3080,8 +3020,7 @@ ULONG __stdcall ICCW_AddRefFromJupiter_Wrapper(IUnknown *pUnk)
     // We do not need to hook with host here
     SetupForComCallDWORDNoHostNotif();
 
-    WRAPPER_NO_CONTRACT;    
-    STATIC_CONTRACT_SO_TOLERANT;
+    WRAPPER_NO_CONTRACT;
 
     return ICCW_AddRefFromJupiter(pUnk);
 }
@@ -3091,8 +3030,7 @@ ULONG __stdcall ICCW_ReleaseFromJupiter_Wrapper(IUnknown *pUnk)
     // We do not need to hook with host here
     SetupForComCallDWORDNoHostNotif();
 
-    WRAPPER_NO_CONTRACT;    
-    STATIC_CONTRACT_SO_TOLERANT;
+    WRAPPER_NO_CONTRACT;
 
     return ICCW_ReleaseFromJupiter(pUnk);
 }
@@ -3103,8 +3041,7 @@ HRESULT __stdcall ICCW_Peg_Wrapper(IUnknown *pUnk)
     // as we are most likely in the middle of a GC
     SetupForComCallHRNoHostNotifNoCheckCanRunManagedCode();
 
-    WRAPPER_NO_CONTRACT;    
-    STATIC_CONTRACT_SO_TOLERANT;
+    WRAPPER_NO_CONTRACT;
 
     return ICCW_Peg(pUnk);
 }
@@ -3115,8 +3052,7 @@ HRESULT __stdcall ICCW_Unpeg_Wrapper(IUnknown *pUnk)
     // as we are most likely in the middle of a GC
     SetupForComCallHRNoHostNotifNoCheckCanRunManagedCode();
 
-    WRAPPER_NO_CONTRACT;    
-    STATIC_CONTRACT_SO_TOLERANT;
+    WRAPPER_NO_CONTRACT;
 
     return ICCW_Unpeg(pUnk);
 }