Stop deallocating provider/events on shutdown (#25369)

1 files changed, 9 insertions, 6 deletions

diff --git a/src/vm/eventpipe.cpp b/src/vm/eventpipe.cpp
index eb8734f40c..c6d23b04e0 100644
--- a/src/vm/eventpipe.cpp
+++ b/src/vm/eventpipe.cpp
@@ -146,12 +146,15 @@ void EventPipe::Shutdown()
                     Disable(static_cast<EventPipeSessionID>(1ULL << i));
             }
 
-            // Remove EventPipeEventSource first since it tries to use the data structures that we remove below.
-            // We need to do this after disabling sessions since those try to write to EventPipeEventSource.
-            delete s_pEventSource;
-            s_pEventSource = nullptr;
-
-            s_config.Shutdown();
+            // dotnet/coreclr: issue 24850: EventPipe shutdown race conditions
+            // Deallocating providers/events here might cause AV if a WriteEvent
+            // was to occur. Thus, we are not doing this cleanup.
+
+            // // Remove EventPipeEventSource first since it tries to use the data structures that we remove below.
+            // // We need to do this after disabling sessions since those try to write to EventPipeEventSource.
+            // delete s_pEventSource;
+            // s_pEventSource = nullptr;
+            // s_config.Shutdown();
         }
     }
     EX_CATCH {}