Add two missing #ifdef related with FEATURE_CORRUPTING_EXCEPTIONS (dotnet/coreclr...
authorJonghyun Park <parjong@gmail.com>
Mon, 9 Jan 2017 11:51:44 +0000 (20:51 +0900)
committerJan Vorlicek <janvorli@microsoft.com>
Mon, 9 Jan 2017 11:51:44 +0000 (12:51 +0100)
Commit migrated from https://github.com/dotnet/coreclr/commit/727481c54d38b12a230fec46052c2d55c9fc3b05

src/coreclr/src/vm/excep.cpp
src/coreclr/src/vm/exceptionhandling.cpp

index 5a6f7c6..1d24237 100644 (file)
@@ -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;
index 1a839be..56c784a 100644 (file)
@@ -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);