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/clrex.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/clrex.h')
| -rw-r--r-- | src/vm/clrex.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/vm/clrex.h b/src/vm/clrex.h index a550a71874..87ad5d056e 100644 --- a/src/vm/clrex.h +++ b/src/vm/clrex.h @@ -12,6 +12,11 @@ #ifndef _CLREX_H_ #define _CLREX_H_ +// BCL classnativelib includes <ex.h> first +#ifndef VM_NO_SO_INFRASTRUCTURE_CODE +#define VM_NO_SO_INFRASTRUCTURE_CODE(x) x +#endif + #include <ex.h> #include "runtimeexceptionkind.h" @@ -811,11 +816,6 @@ class EEFileLoadException : public EEException #define GET_EXCEPTION() (__pException == NULL ? __defaultException.Validate() : __pException.GetValue()) #endif // _DEBUG -// When we throw an exception, we need stay in SO-intolerant state and -// probe for sufficient stack so that we don't SO during the processing. -#undef HANDLE_SO_TOLERANCE_FOR_THROW -#define HANDLE_SO_TOLERANCE_FOR_THROW STACK_PROBE_FOR_THROW(GetThread()); - LONG CLRNoCatchHandler(EXCEPTION_POINTERS* pExceptionInfo, PVOID pv); // Re-define the macro to add automatic restoration of the guard page to PAL_EXCEPT and PAL_EXCEPT_FILTER and @@ -899,9 +899,7 @@ LONG CLRNoCatchHandler(EXCEPTION_POINTERS* pExceptionInfo, PVOID pv); #undef EX_ENDTRY #define EX_ENDTRY \ PAL_CPP_ENDTRY \ - SO_INFRASTRUCTURE_CODE(if (__state.DidCatch()) { RESTORE_SO_TOLERANCE_STATE; }) \ - SO_INFRASTRUCTURE_CODE(if (__state.DidCatchSO()) { HANDLE_STACKOVERFLOW_AFTER_CATCH; }) \ - NO_SO_INFRASTRUCTURE_CODE_ASSERTE(!__state.DidCatchSO()) \ + _ASSERTE(!__state.DidCatchSO()); // CLRException::GetErrorInfo below invokes GetComIPFromObjectRef @@ -1011,14 +1009,12 @@ NOINLINE BOOL HasIllegalReentrancyRare(); } \ if (CURRENT_THREAD != NULL) \ { \ - BEGIN_SO_INTOLERANT_CODE_NOTHROW(CURRENT_THREAD, *__phr = COR_E_STACKOVERFLOW); \ EX_TRY_THREAD(CURRENT_THREAD); \ { \ #define END_EXTERNAL_ENTRYPOINT \ } \ EX_CATCH_HRESULT(*__phr); \ - END_SO_INTOLERANT_CODE; \ } \ } \ } \ @@ -1032,7 +1028,6 @@ NOINLINE BOOL HasIllegalReentrancyRare(); *__phr = GET_EXCEPTION()->GetHR(); \ } \ EX_END_CATCH(RethrowCorruptingExceptionsEx(fCond)); \ - END_SO_INTOLERANT_CODE; \ } \ } \ } \ |