Bug 1151168 - Don't flush profiled threads that are pending deletion on JS shutdown and don't delete expired markers when resetting the profile buffer. (r=djvj)

tools/profiler/ProfileEntry.cpp

@@ -153,7 +153,6 @@ void ProfileBuffer::deleteExpiredStoredMarkers() {
 void ProfileBuffer::reset() {
   mGeneration += 2;
   mReadPos = mWritePos = 0;
-  deleteExpiredStoredMarkers();
 }
 
 #define DYNAMIC_MAX_STRING 512

tools/profiler/TableTicker.cpp

@@ -378,7 +378,8 @@ void TableTicker::FlushOnJSShutdown(JSRuntime* aRuntime)
 
     for (size_t i = 0; i < sRegisteredThreads->size(); i++) {
       // Thread not being profiled, skip it.
-      if (!sRegisteredThreads->at(i)->Profile()) {
+      if (!sRegisteredThreads->at(i)->Profile() ||
+          sRegisteredThreads->at(i)->IsPendingDelete()) {
         continue;
       }