diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-01-09 20:51:44 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-01-09 12:51:44 +0100 |
| commit | 727481c54d38b12a230fec46052c2d55c9fc3b05 (patch) | |
| tree | 654b645361dc01b87919b71bc9069d69125ee99c /src/vm | |
| parent | 188b465e3fec4c0bcaf61ec058d5b406222e3679 (diff) | |
| download | coreclr-727481c54d38b12a230fec46052c2d55c9fc3b05.tar.gz coreclr-727481c54d38b12a230fec46052c2d55c9fc3b05.tar.bz2 coreclr-727481c54d38b12a230fec46052c2d55c9fc3b05.zip | |
Add two missing #ifdef related with FEATURE_CORRUPTING_EXCEPTIONS (#8850)
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/excep.cpp | 4 | ||||
| -rw-r--r-- | src/vm/exceptionhandling.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/vm/excep.cpp b/src/vm/excep.cpp index 5a6f7c673f..1d24237c02 100644 --- a/src/vm/excep.cpp +++ b/src/vm/excep.cpp @@ -8986,11 +8986,13 @@ LONG ReflectionInvocationExceptionFilter( #else // !(_WIN64 || _TARGET_X86_) #error Unsupported platform #endif // _WIN64 - + +#ifdef FEATURE_CORRUPTING_EXCEPTIONS if (pEHTracker->GetCorruptionSeverity() == ProcessCorrupting) { EEPolicy::HandleFatalError(COR_E_FAILFAST, reinterpret_cast<UINT_PTR>(pExceptionInfo->ExceptionRecord->ExceptionAddress), NULL, pExceptionInfo); } +#endif // FEATURE_CORRUPTING_EXCEPTIONS } return ret; diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp index 1a839bea96..56c784a37f 100644 --- a/src/vm/exceptionhandling.cpp +++ b/src/vm/exceptionhandling.cpp @@ -4662,6 +4662,7 @@ VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHar ThreadExceptionState * pCurTES = pCurThread->GetExceptionState(); _ASSERTE(pCurTES != NULL); +#ifdef FEATURE_CORRUPTING_EXCEPTIONS ExceptionTracker* pEHTracker = pCurTES->GetCurrentExceptionTracker(); if (pEHTracker == NULL) { @@ -4673,6 +4674,7 @@ VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHar pCurTES->SetLastActiveExceptionCorruptionSeverity(severity); } +#endif // FEATURE_CORRUPTING_EXCEPTIONS } throw std::move(ex); |