Prevent core dumps at shutdown when the ETW subsystem races with debugger cleanup...

diff --git a/src/vm/ceemain.cpp b/src/vm/ceemain.cpp
index 9963e7c1ac306bc544f819c6763e5c4b67aeff1b..1e6d0e8068c907c823d1b453bad44788a4d32dec 100644 (file)
--- a/src/vm/ceemain.cpp
+++ b/src/vm/ceemain.cpp
@@ -4188,7 +4188,6 @@ static void TerminateDebugger(void)
 
         // This will kill the helper thread, delete the Debugger object, and free all resources.
         g_pDebugInterface->StopDebugger();
-        g_pDebugInterface = NULL;
     }
 
     // Delete this after Debugger, since Debugger may use this.

diff --git a/src/vm/eedbginterfaceimpl.cpp b/src/vm/eedbginterfaceimpl.cpp
index 219082011ba92bfabf0837bf1cd33d7144d1b6c4..53cb2883193eb60db7944b550b6ba68ab85a140b 100644 (file)
--- a/src/vm/eedbginterfaceimpl.cpp
+++ b/src/vm/eedbginterfaceimpl.cpp
@@ -1657,8 +1657,6 @@ BOOL EEDbgInterfaceImpl::ObjIsInstanceOf(Object *pElement, TypeHandle toTypeHnd)
 void EEDbgInterfaceImpl::ClearAllDebugInterfaceReferences()
 {
     LIMITED_METHOD_CONTRACT;
-
-    g_pDebugInterface = NULL;
 }
 
 #ifndef DACCESS_COMPILE