Delete GetActionOnFailureNoHostNotification
authorJan Kotas <jkotas@microsoft.com>
Sat, 25 Apr 2020 05:03:38 +0000 (22:03 -0700)
committerJan Kotas <jkotas@microsoft.com>
Sat, 25 Apr 2020 13:53:00 +0000 (06:53 -0700)
src/coreclr/src/vm/eepolicy.cpp
src/coreclr/src/vm/eepolicy.h

index 76a315b86b6e81dfe9472cbd115702cf610956bb..3ba29dbd402cce03f1c1ce738ad4b86e33bad6cf 100644 (file)
@@ -130,24 +130,6 @@ EPolicyAction EEPolicy::GetFinalAction(EPolicyAction action, Thread *pThread)
     }
 }
 
-EPolicyAction EEPolicy::GetActionOnFailureNoHostNotification(EClrFailure failure)
-{
-    CONTRACTL
-    {
-        MODE_ANY;
-        GC_NOTRIGGER;
-        NOTHROW;
-    }CONTRACTL_END;
-
-    _ASSERTE (failure < MaxClrFailure);
-    if (failure == FAIL_StackOverflow)
-    {
-        return m_ActionOnFailure[failure];
-    }
-
-    return GetFinalAction(m_ActionOnFailure[failure], GetThread());
-}
-
 EPolicyAction EEPolicy::GetActionOnFailure(EClrFailure failure)
 {
     CONTRACTL
@@ -163,8 +145,7 @@ EPolicyAction EEPolicy::GetActionOnFailure(EClrFailure failure)
         return m_ActionOnFailure[failure];
     }
 
-    EPolicyAction finalAction = GetActionOnFailureNoHostNotification(failure);
-    return finalAction;
+    return GetFinalAction(m_ActionOnFailure[failure], GetThread());
 }
 
 void SafeExitProcess(UINT exitCode, BOOL fAbort = FALSE, ShutdownCompleteAction sca = SCA_ExitProcessWhenShutdownComplete)
index 217e6c73f9ca3200f0fcc979ed36187e5e9c3d4f..ac6bfa33c4dc9c651392fab55b3214811c1f7add 100644 (file)
@@ -62,11 +62,7 @@ public:
         return GetFinalAction(m_DefaultAction[operation], pThread);
     }
 
-    // Generally GetActionOnFailure should be used so that a host can get notification.
-    // But if we have notified host on the same failure, but we need to check escalation again,
-    // GetActionOnFailureNoHostNotification can be used.
     EPolicyAction GetActionOnFailure(EClrFailure failure);
-    EPolicyAction GetActionOnFailureNoHostNotification(EClrFailure failure);
 
     static EPolicyAction DetermineResourceConstraintAction(Thread *pThread);