summaryrefslogtreecommitdiff
path: root/src/vm/excep.h
diff options
context:
space:
mode:
authordanmosemsft <danmose@microsoft.com>2017-02-11 06:15:01 (GMT)
committerdanmosemsft <danmose@microsoft.com>2017-02-11 06:15:01 (GMT)
commit87f8b67a4ee90ef807927f5083e237cb88b34725 (patch)
tree2ad1316d160dd7746c20d1668f5e7a8bd2709bf3 /src/vm/excep.h
parentb45b7e4eb467bca44f9d77959df0337bdcecbd3c (diff)
downloadcoreclr-87f8b67a4ee90ef807927f5083e237cb88b34725.zip
coreclr-87f8b67a4ee90ef807927f5083e237cb88b34725.tar.gz
coreclr-87f8b67a4ee90ef807927f5083e237cb88b34725.tar.bz2
Revert "Remove always defined FEATURE_CORRUPTING_EXCEPTIONS"
This reverts commit b0dab0d6de90a38dfbf0d6b2039a7b8f5269d802.
Diffstat (limited to 'src/vm/excep.h')
-rw-r--r--src/vm/excep.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/vm/excep.h b/src/vm/excep.h
index 5818de7..6057c55 100644
--- a/src/vm/excep.h
+++ b/src/vm/excep.h
@@ -268,7 +268,9 @@ VOID DECLSPEC_NORETURN RealCOMPlusThrowNonLocalized(RuntimeExceptionKind reKind,
//==========================================================================
VOID DECLSPEC_NORETURN RealCOMPlusThrow(OBJECTREF throwable
+#ifdef FEATURE_CORRUPTING_EXCEPTIONS
, CorruptionSeverity severity = NotCorrupting
+#endif // FEATURE_CORRUPTING_EXCEPTIONS
);
//==========================================================================
@@ -814,6 +816,7 @@ LONG ReflectionInvocationExceptionFilter(
EXCEPTION_POINTERS *pExceptionInfo, // the pExceptionInfo passed to a filter function.
PVOID pParam);
+#ifdef FEATURE_CORRUPTING_EXCEPTIONS
// -----------------------------------------------------------------------
// Support for Corrupted State Exceptions
// -----------------------------------------------------------------------
@@ -849,6 +852,7 @@ public:
void static ResetLastActiveCorruptionSeverityPostCatchHandler(Thread *pThread);
};
+#endif // FEATURE_CORRUPTING_EXCEPTIONS
#ifndef DACCESS_COMPILE
// Switches to the previous AppDomain on the thread. See implementation for detailed comments.
@@ -903,12 +907,16 @@ private:
void static DeliverNotificationInternal(ExceptionNotificationHandlerType notificationType,
OBJECTREF *pThrowable
+#ifdef FEATURE_CORRUPTING_EXCEPTIONS
, CorruptionSeverity severity
+#endif // FEATURE_CORRUPTING_EXCEPTIONS
);
void static InvokeNotificationDelegate(ExceptionNotificationHandlerType notificationType, OBJECTREF *pDelegate, OBJECTREF *pEventArgs,
OBJECTREF *pAppDomain
+#ifdef FEATURE_CORRUPTING_EXCEPTIONS
, CorruptionSeverity severity
+#endif // FEATURE_CORRUPTING_EXCEPTIONS
);
public:
@@ -916,10 +924,14 @@ public:
void static DeliverNotification(ExceptionNotificationHandlerType notificationType,
OBJECTREF *pThrowable
+#ifdef FEATURE_CORRUPTING_EXCEPTIONS
, CorruptionSeverity severity
+#endif // FEATURE_CORRUPTING_EXCEPTIONS
);
+#ifdef FEATURE_CORRUPTING_EXCEPTIONS
BOOL static CanDelegateBeInvokedForException(OBJECTREF *pDelegate, CorruptionSeverity severity);
+#endif // FEATURE_CORRUPTING_EXCEPTIONS
#endif // FEATURE_EXCEPTION_NOTIFICATIONS
public: