Code review feedback

src/coreclr/src/debug/createdump/CMakeLists.txt

@@ -9,9 +9,6 @@ remove_definitions(-D_UNICODE)
 
 if(CLR_CMAKE_HOST_WIN32)
 
-    # Use static crt
-    add_definitions(-MT)
-
     set(CREATEDUMP_SOURCES
         main.cpp
         createdumpwindows.cpp
@@ -25,7 +22,6 @@ if(CLR_CMAKE_HOST_WIN32)
     target_link_libraries(createdump
         kernel32.lib
         ${STATIC_MT_CRT_LIB}
-        ${STATIC_MT_CPP_LIB}
         advapi32.lib
         version.lib
         dbghelp.lib

src/coreclr/src/vm/eepolicy.cpp

@@ -498,36 +498,14 @@ void SafeExitProcess(UINT exitCode, BOOL fAbort = FALSE, ShutdownCompleteAction
         // Watson code
         CONTRACT_VIOLATION(ThrowsViolation);
 
-        EEPolicy::ExitProcessViaShim(exitCode, fAbort);
-    }
-}
-
-// This is a helper to exit the process after coordinating with the shim. It is used by
-// SafeExitProcess above, as well as from CorHost2::ExitProcess when we know that we must
-// exit the process without doing further work to shutdown this runtime. This first attempts
-// to call back to the Shim to shutdown any other runtimes within the process.
-//
-// IMPORTANT NOTE: exercise extreme caution when adding new calls to this method. It is highly
-// likely that you want to call SafeExitProcess, or EEPolicy::HandleExitProcess instead of this.
-// This function only exists to factor some common code out of the methods mentioned above.
-
-//static
-void EEPolicy::ExitProcessViaShim(UINT exitCode, BOOL fAbort)
-{
-    LIMITED_METHOD_CONTRACT;
-
-    // We must call back to the Shim in order to exit the process, as this may be just one
-    // runtime in a process with many. We need to give the other runtimes a chance to exit
-    // cleanly. If we can't make the call, or if the call fails for some reason, then we
-    // simply exit the process here, which is rude to the others, but the best we can do.
-
-    if (fAbort)
-    {
-        CrashDumpAndTerminateProcess(exitCode);
-    }
-    else
-    {
-        ExitProcess(exitCode);
+        if (fAbort)
+        {
+            CrashDumpAndTerminateProcess(exitCode);
+        }
+        else
+        {
+            ExitProcess(exitCode);
+        }
     }
 }
 

src/coreclr/src/vm/eepolicy.h

@@ -145,13 +145,7 @@ class EEPolicy
 
     static void LogFatalError(UINT exitCode, UINT_PTR address, LPCWSTR pMessage, PEXCEPTION_POINTERS pExceptionInfo, LPCWSTR errorSource, LPCWSTR argExceptionString=NULL);
 
-    // IMPORTANT NOTE: only the following two functions should be calling ExitProcessViaShim.
-    // - CorHost2::ExitProcess
-    // - SafeExitProcess
-    friend class CorHost2;
     friend void SafeExitProcess(UINT exitCode, BOOL fAbort, ShutdownCompleteAction sca);
-
-    static void ExitProcessViaShim(UINT exitCode, BOOL fAbort);
 };
 
 void InitEEPolicy();

src/coreclr/src/vm/excep.cpp

@@ -4222,7 +4222,7 @@ LONG WatsonLastChance(                  // EXCEPTION_CONTINUE_SEARCH, _CONTINUE_
 
 #ifdef HOST_WINDOWS
 
-// Crash dump generating program arguments. Initialized in PROCAbortInitialize().
+// Crash dump generating program arguments if enabled.
 LPCWSTR g_createDumpCommandLine = nullptr;
 
 static void