Revert "Enable EventPipe across Unix and Windows (#14772)" (#15609)

This reverts commit 7524d72d4f0f634fe5407280b83c25181dc8c556.

1 files changed, 13 insertions, 23 deletions

diff --git a/src/vm/eventpipeprovider.cpp b/src/vm/eventpipeprovider.cpp
index 84a90e4abb..c10dd33638 100644
--- a/src/vm/eventpipeprovider.cpp
+++ b/src/vm/eventpipeprovider.cpp
@@ -24,7 +24,6 @@ EventPipeProvider::EventPipeProvider(EventPipeConfiguration *pConfig, const SStr
 
     m_providerName = providerName;
     m_enabled = false;
-    m_deleteDeferred = false;
     m_keywords = 0;
     m_providerLevel = EventPipeEventLevel::Critical;
     m_pEventList = new SList<SListElem<EventPipeEvent*>>();
@@ -37,8 +36,8 @@ EventPipeProvider::~EventPipeProvider()
 {
     CONTRACTL
     {
-        NOTHROW;
-        GC_TRIGGERS;
+        THROWS;
+        GC_NOTRIGGER;
         MODE_ANY;
     }
     CONTRACTL_END;
@@ -46,30 +45,21 @@ EventPipeProvider::~EventPipeProvider()
     // Free all of the events.
     if(m_pEventList != NULL)
     {
-        // We swallow exceptions here because the HOST_BREAKABLE
-        // lock may throw and this destructor gets called in throw
-        // intolerant places. If that happens the event list will leak
-        EX_TRY
-        {
-            // Take the lock before manipulating the list.
-            CrstHolder _crst(EventPipe::GetLock());
+        // Take the lock before manipulating the list.
+        CrstHolder _crst(EventPipe::GetLock());
 
-            SListElem<EventPipeEvent*> *pElem = m_pEventList->GetHead();
-            while(pElem != NULL)
-            {
-                EventPipeEvent *pEvent = pElem->GetValue();
-                delete pEvent;
-
-                SListElem<EventPipeEvent*> *pCurElem = pElem;
-                pElem = m_pEventList->GetNext(pElem);
-                delete pCurElem;
-            }
+        SListElem<EventPipeEvent*> *pElem = m_pEventList->GetHead();
+        while(pElem != NULL)
+        {
+            EventPipeEvent *pEvent = pElem->GetValue();
+            delete pEvent;
 
-            delete m_pEventList;
+            SListElem<EventPipeEvent*> *pCurElem = pElem;
+            pElem = m_pEventList->GetNext(pElem);
+            delete pCurElem;
         }
-        EX_CATCH { }
-        EX_END_CATCH(SwallowAllExceptions);
 
+        delete m_pEventList;
         m_pEventList = NULL;
     }
 }