diff options
| author | Filip Navara <filip.navara@gmail.com> | 2019-01-23 22:13:01 +0100 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-01-23 13:13:01 -0800 |
| commit | a28b25aacdcd2adb0fdfa70bd869f53ba6565976 (patch) | |
| tree | d37eeacbb212a5633edabf93300dbcd18980f13f /src/vm/fcall.h | |
| parent | 797888982e264e2ecfbc436f782f2f6704644e84 (diff) | |
| download | coreclr-a28b25aacdcd2adb0fdfa70bd869f53ba6565976.tar.gz coreclr-a28b25aacdcd2adb0fdfa70bd869f53ba6565976.tar.bz2 coreclr-a28b25aacdcd2adb0fdfa70bd869f53ba6565976.zip | |
Remove all traces of FEATURE_STACK_PROBE. (#22149)
Diffstat (limited to 'src/vm/fcall.h')
| -rw-r--r-- | src/vm/fcall.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/vm/fcall.h b/src/vm/fcall.h index 9fb7ba0322..24b6f383a1 100644 --- a/src/vm/fcall.h +++ b/src/vm/fcall.h @@ -220,7 +220,6 @@ #include "gms.h" #include "runtimeexceptionkind.h" #include "debugreturn.h" -#include "stackprobe.h" //============================================================================================== // These macros defeat compiler optimizations that might mix nonvolatile @@ -583,8 +582,7 @@ LPVOID __FCThrowArgument(LPVOID me, enum RuntimeExceptionKind reKind, LPCWSTR ar #define HELPER_METHOD_FRAME_BEGIN_EX_NOTHROW(ret, helperFrame, gcpoll, allowGC, probeFailExpr) \ HELPER_METHOD_FRAME_BEGIN_EX_BODY(ret, helperFrame, gcpoll, allowGC) \ /* <TODO>TODO TURN THIS ON!!! </TODO> */ \ - /* gcpoll; */ \ - BEGIN_SO_INTOLERANT_CODE_NOTHROW(GET_THREAD(), probeFailExpr); + /* gcpoll; */ // The while(__helperframe.RestoreState() needs a bit of explanation. @@ -615,7 +613,6 @@ LPVOID __FCThrowArgument(LPVOID me, enum RuntimeExceptionKind reKind, LPCWSTR ar HELPER_METHOD_FRAME_END_EX_BODY(gcpoll,allowGC); #define HELPER_METHOD_FRAME_END_EX_NOTHROW(gcpoll,allowGC) \ - END_SO_INTOLERANT_CODE; \ HELPER_METHOD_FRAME_END_EX_BODY(gcpoll,allowGC); #define HELPER_METHOD_FRAME_BEGIN_ATTRIB(attribs) \ @@ -869,8 +866,6 @@ private: { \ Thread *_pThread = GetThread(); \ Thread::ObjectRefFlush(_pThread); \ - /*_ASSERTE (_pThread->IsSOTolerant() ||*/ \ - /* _pThread->HasThreadStateNC(Thread::TSNC_DisableSOCheckInHCALL)); */ \ } \ FCallCheck __fCallCheck(__FILE__, __LINE__); \ FCALL_TRANSITION_BEGIN(); \ @@ -1378,8 +1373,7 @@ typedef UINT16 FC_UINT16_RET; #define FCALL_CHECK \ THROWS; \ DISABLED(GC_TRIGGERS); /* FCALLS with HELPER frames have issues with GC_TRIGGERS */ \ - MODE_COOPERATIVE; \ - SO_TOLERANT + MODE_COOPERATIVE; // // FCALL_CONTRACT should be the following shortcut: @@ -1389,7 +1383,6 @@ typedef UINT16 FC_UINT16_RET; // Since there is very little value in having runtime contracts in FCalls, FCALL_CONTRACT is defined as static contract only for performance reasons. // #define FCALL_CONTRACT \ - STATIC_CONTRACT_SO_TOLERANT; \ STATIC_CONTRACT_THROWS; \ /* FCALLS are a special case contract wise, they are "NOTRIGGER, unless you setup a frame" */ \ STATIC_CONTRACT_GC_NOTRIGGER; \ |