From 1d326bbdc1ebbd25b4680d3c801d3a9fb1b7bdbc Mon Sep 17 00:00:00 2001 From: Lee Culver Date: Thu, 19 May 2016 23:46:00 -0700 Subject: [PATCH] Prevent core dumps at shutdown when the ETW subsystem races with debugger cleanup. (#5066) --- src/vm/ceemain.cpp | 1 - src/vm/eedbginterfaceimpl.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/vm/ceemain.cpp b/src/vm/ceemain.cpp index 9963e7c..1e6d0e8 100644 --- 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 2190820..53cb288 100644 --- 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 -- 2.7.4