Delete GetDefaultAction

diff --git a/src/coreclr/src/vm/eepolicy.cpp b/src/coreclr/src/vm/eepolicy.cpp
index 6cec679..873b87f 100644 (file)
--- a/src/coreclr/src/vm/eepolicy.cpp
+++ b/src/coreclr/src/vm/eepolicy.cpp
@@ -46,18 +46,6 @@ EEPolicy::EEPolicy ()
     CONTRACTL_END;
 
     int n;
-    for (n = 0; n < MaxClrOperation; n++) {
-        m_DefaultAction[n] = eNoAction;
-    }
-
-    m_DefaultAction[OPR_ThreadAbort] = eAbortThread;
-    m_DefaultAction[OPR_ThreadRudeAbortInNonCriticalRegion] = eRudeAbortThread;
-    m_DefaultAction[OPR_ThreadRudeAbortInCriticalRegion] = eRudeAbortThread;
-    m_DefaultAction[OPR_AppDomainUnload] = eUnloadAppDomain;
-    m_DefaultAction[OPR_AppDomainRudeUnload] = eRudeUnloadAppDomain;
-    m_DefaultAction[OPR_ProcessExit] = eExitProcess;
-    m_DefaultAction[OPR_FinalizerRun] = eNoAction;
-
     for (n = 0; n < MaxClrFailure; n++) {
         m_ActionOnFailure[n] = eNoAction;
     }
@@ -68,57 +56,6 @@ EEPolicy::EEPolicy ()
     m_ActionOnFailure[FAIL_StackOverflow] = eRudeExitProcess;
 }
 
-EPolicyAction EEPolicy::GetFinalAction(EPolicyAction action, Thread *pThread)
-{
-    LIMITED_METHOD_CONTRACT;
-    _ASSERTE(static_cast<UINT>(action) < MaxPolicyAction);
-
-    if (action < eAbortThread || action > eExitProcess)
-    {
-        return action;
-    }
-
-    while(TRUE)
-    {
-        // Look at default action.  If the default action is more severe,
-        // use the default action instead.
-        EPolicyAction defaultAction = action;
-        switch (action)
-        {
-            case eAbortThread:
-            defaultAction = m_DefaultAction[OPR_ThreadAbort];
-                break;
-            case eRudeAbortThread:
-                defaultAction = m_DefaultAction[OPR_ThreadRudeAbortInCriticalRegion];
-                break;
-            case eUnloadAppDomain:
-            defaultAction = m_DefaultAction[OPR_AppDomainUnload];
-                break;
-            case eRudeUnloadAppDomain:
-            defaultAction = m_DefaultAction[OPR_AppDomainRudeUnload];
-                break;
-            case eExitProcess:
-            defaultAction = m_DefaultAction[OPR_ProcessExit];
-            if (defaultAction < action)
-                {
-                defaultAction = action;
-                }
-                break;
-            default:
-                break;
-            }
-        _ASSERTE(static_cast<UINT>(defaultAction) < MaxPolicyAction);
-
-        if (defaultAction == action)
-            {
-            return action;
-            }
-
-        _ASSERTE(defaultAction > action);
-        action = defaultAction;
-    }
-}
-
 EPolicyAction EEPolicy::GetActionOnFailure(EClrFailure failure)
 {
     CONTRACTL
@@ -134,7 +71,7 @@ EPolicyAction EEPolicy::GetActionOnFailure(EClrFailure failure)
         return m_ActionOnFailure[failure];
     }
 
-    return GetFinalAction(m_ActionOnFailure[failure], GetThread());
+    return m_ActionOnFailure[failure];
 }
 
 void SafeExitProcess(UINT exitCode, BOOL fAbort = FALSE, ShutdownCompleteAction sca = SCA_ExitProcessWhenShutdownComplete)

diff --git a/src/coreclr/src/vm/eepolicy.h b/src/coreclr/src/vm/eepolicy.h
index e9de4f8..e84cf5f 100644 (file)
--- a/src/coreclr/src/vm/eepolicy.h
+++ b/src/coreclr/src/vm/eepolicy.h
@@ -37,7 +37,7 @@ public:
     {
         WRAPPER_NO_CONTRACT;
         _ASSERTE(static_cast<UINT>(operation) < MaxClrOperation);
-        return GetFinalAction(m_DefaultAction[operation], pThread);
+        return m_DefaultAction[operation];
     }
 
     EPolicyAction GetActionOnFailure(EClrFailure failure);
@@ -53,11 +53,8 @@ public:
     static void HandleExitProcessFromEscalation(EPolicyAction action, UINT exitCode);
 
 private:
-    EPolicyAction m_DefaultAction[MaxClrOperation];
     EPolicyAction m_ActionOnFailure[MaxClrFailure];
 
-    EPolicyAction GetFinalAction(EPolicyAction action, Thread *pThread);
-
     static void LogFatalError(UINT exitCode, UINT_PTR address, LPCWSTR pMessage, PEXCEPTION_POINTERS pExceptionInfo, LPCWSTR errorSource, LPCWSTR argExceptionString=NULL);
 
     friend void SafeExitProcess(UINT exitCode, BOOL fAbort, ShutdownCompleteAction sca);